KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes gpio_export patch

Browse source 
SVN-Revision: 30521
This commit is contained in:
John Crispin 2012-02-14 15:05:57 +00:00
parent b0a11ba9fe
commit 55bf39e98c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/linux/lantiq/patches/205-owrt-gpio-export.patch
View file

@ -1,6 +1,8 @@
--- a/drivers/gpio/gpiolib.c Index: linux-3.1.10/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c ===================================================================
@@ -64,9 +64,9 @@ struct gpio_desc { --- linux-3.1.10.orig/drivers/gpio/gpiolib.c 2012-01-18 16:33:18.000000000 +0100
+++ linux-3.1.10/drivers/gpio/gpiolib.c 2012-02-03 20:22:42.554529747 +0100
@@ -64,9 +64,9 @@
#define GPIO_FLAGS_MASK ((1 << ID_SHIFT) - 1) #define GPIO_FLAGS_MASK ((1 << ID_SHIFT) - 1)
#define GPIO_TRIGGER_MASK (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE)) #define GPIO_TRIGGER_MASK (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE))
@ -12,7 +14,7 @@
}; };
static struct gpio_desc gpio_desc[ARCH_NR_GPIOS]; static struct gpio_desc gpio_desc[ARCH_NR_GPIOS];
@@ -76,9 +76,9 @@ static DEFINE_IDR(dirent_idr); @@ -76,9 +76,9 @@
static inline void desc_set_label(struct gpio_desc *d, const char *label) static inline void desc_set_label(struct gpio_desc *d, const char *label)
{ {
@ -24,17 +26,15 @@
} }
/* Warn when drivers omit gpio_request() calls -- legal but ill-advised /* Warn when drivers omit gpio_request() calls -- legal but ill-advised
@@ -727,7 +727,8 @@ int gpio_export(unsigned gpio, bool dire @@ -727,7 +727,6 @@
if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) if (desc->chip->names && desc->chip->names[gpio - desc->chip->base])
ioname = desc->chip->names[gpio - desc->chip->base]; ioname = desc->chip->names[gpio - desc->chip->base];
- -
+ else
+ ioname = gpio_desc[gpio].label;
if (status == 0) { if (status == 0) {
struct device *dev; struct device *dev;
@@ -1347,11 +1348,11 @@ const char *gpiochip_is_requested(struct @@ -1347,11 +1346,11 @@
return NULL; return NULL;
if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
return NULL; return NULL;