diff options
| author | John Crispin <blogic@openwrt.org> | 2011-11-03 15:15:52 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2011-11-03 15:15:52 +0000 |
| commit | fc4b9802d7d9bd293e71057831d02fc0169fc9d3 (patch) | |
| tree | b174b3a3d03c0c2b4a9b9c980efe38089069a2d4 /target/linux/lantiq/patches/205-owrt-gpio-export.patch | |
| parent | e4f42228c62c1ef8f075b6765f090af0983feb89 (diff) | |
| download | upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.gz upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.bz2 upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.zip | |
lantiq: bump to 3.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches/205-owrt-gpio-export.patch')
| -rw-r--r-- | target/linux/lantiq/patches/205-owrt-gpio-export.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches/205-owrt-gpio-export.patch b/target/linux/lantiq/patches/205-owrt-gpio-export.patch new file mode 100644 index 0000000000..710d2745c9 --- /dev/null +++ b/target/linux/lantiq/patches/205-owrt-gpio-export.patch @@ -0,0 +1,52 @@ +--- a/drivers/gpio/gpiolib.c ++++ b/drivers/gpio/gpiolib.c +@@ -64,9 +64,9 @@ struct gpio_desc { + #define GPIO_FLAGS_MASK ((1 << ID_SHIFT) - 1) + #define GPIO_TRIGGER_MASK (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE)) + +-#ifdef CONFIG_DEBUG_FS ++//#ifdef CONFIG_DEBUG_FS + const char *label; +-#endif ++//#endif + }; + static struct gpio_desc gpio_desc[ARCH_NR_GPIOS]; + +@@ -76,9 +76,9 @@ static DEFINE_IDR(dirent_idr); + + static inline void desc_set_label(struct gpio_desc *d, const char *label) + { +-#ifdef CONFIG_DEBUG_FS ++//#ifdef CONFIG_DEBUG_FS + d->label = label; +-#endif ++//#endif + } + + /* Warn when drivers omit gpio_request() calls -- legal but ill-advised +@@ -727,7 +727,8 @@ int gpio_export(unsigned gpio, bool dire + + if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) + ioname = desc->chip->names[gpio - desc->chip->base]; +- ++ else ++ ioname = gpio_desc[gpio].label; + if (status == 0) { + struct device *dev; + +@@ -1347,11 +1348,11 @@ const char *gpiochip_is_requested(struct + return NULL; + if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) + return NULL; +-#ifdef CONFIG_DEBUG_FS ++//#ifdef CONFIG_DEBUG_FS + return gpio_desc[gpio].label; +-#else +- return "?"; +-#endif ++//#else ++// return "?"; ++//#endif + } + EXPORT_SYMBOL_GPL(gpiochip_is_requested); + |