From 6918ea2484861cbf806c812b95a814ab40063c05 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 27 Sep 2014 19:10:51 +0000 Subject: brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014 Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli SVN-Revision: 42678 --- ..._rpi-Don-t-register-with-lirc_dev-if-we-can-t-cl.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'target/linux/brcm2708/patches-3.10/0103-lirc_rpi-Don-t-register-with-lirc_dev-if-we-can-t-cl.patch') diff --git a/target/linux/brcm2708/patches-3.10/0103-lirc_rpi-Don-t-register-with-lirc_dev-if-we-can-t-cl.patch b/target/linux/brcm2708/patches-3.10/0103-lirc_rpi-Don-t-register-with-lirc_dev-if-we-can-t-cl.patch index 9e026df20b..e6f93b671a 100644 --- a/target/linux/brcm2708/patches-3.10/0103-lirc_rpi-Don-t-register-with-lirc_dev-if-we-can-t-cl.patch +++ b/target/linux/brcm2708/patches-3.10/0103-lirc_rpi-Don-t-register-with-lirc_dev-if-we-can-t-cl.patch @@ -1,7 +1,7 @@ -From 72ce4c24efeac1b3260b3b10ec7cbc2701dcef5a Mon Sep 17 00:00:00 2001 +From a4a78ef42a4720e11e6489dc44936153e601d89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Dragi=C4=87?= Date: Wed, 25 Sep 2013 18:44:05 +0200 -Subject: [PATCH 103/174] lirc_rpi: Don't register with lirc_dev if we can't +Subject: [PATCH 103/196] lirc_rpi: Don't register with lirc_dev if we can't claim gpio pins Currently the lirc_rpi module always registers a new lirc device. @@ -13,6 +13,8 @@ Also, don't free gpio pins that we haven't claimed. drivers/staging/media/lirc/lirc_rpi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) +diff --git a/drivers/staging/media/lirc/lirc_rpi.c b/drivers/staging/media/lirc/lirc_rpi.c +index cb32042..c76f696 100644 --- a/drivers/staging/media/lirc/lirc_rpi.c +++ b/drivers/staging/media/lirc/lirc_rpi.c @@ -590,8 +590,6 @@ static int __init lirc_rpi_init(void) @@ -24,7 +26,7 @@ Also, don't free gpio pins that we haven't claimed. platform_device_unregister(lirc_rpi_dev); platform_driver_unregister(&lirc_rpi_driver); lirc_buffer_free(&rbuf); -@@ -623,6 +621,10 @@ static int __init lirc_rpi_init_module(v +@@ -623,6 +621,10 @@ static int __init lirc_rpi_init_module(void) goto exit_rpi; } @@ -35,7 +37,7 @@ Also, don't free gpio pins that we haven't claimed. driver.features = LIRC_CAN_SET_SEND_DUTY_CYCLE | LIRC_CAN_SET_SEND_CARRIER | LIRC_CAN_SEND_PULSE | -@@ -640,10 +642,6 @@ static int __init lirc_rpi_init_module(v +@@ -640,10 +642,6 @@ static int __init lirc_rpi_init_module(void) printk(KERN_INFO LIRC_DRIVER_NAME ": driver registered!\n"); @@ -46,7 +48,7 @@ Also, don't free gpio pins that we haven't claimed. return 0; exit_rpi: -@@ -654,6 +652,9 @@ static int __init lirc_rpi_init_module(v +@@ -654,6 +652,9 @@ static int __init lirc_rpi_init_module(void) static void __exit lirc_rpi_exit_module(void) { @@ -56,3 +58,6 @@ Also, don't free gpio pins that we haven't claimed. lirc_rpi_exit(); lirc_unregister_driver(driver.minor); +-- +1.9.1 + -- cgit v1.2.3