diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
commit | ab47d507d2ff2b0846433bc3c77de03c995258f6 (patch) | |
tree | eaa83c336bf1e8a4942376277bb17dab04a0630e /target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch | |
parent | 2154d8cde2088958a3c5f221bac76dfb8c9da600 (diff) | |
download | upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.gz upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.bz2 upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.zip |
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch index 1d0f5ba651..2e4e820b2b 100644 --- a/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch +++ b/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch @@ -3,7 +3,7 @@ does not lock access between files. --- a/drivers/mmc/host/gpiommc.c +++ b/drivers/mmc/host/gpiommc.c -@@ -143,6 +143,8 @@ +@@ -143,6 +143,8 @@ struct gpiommc_configfs_device { struct platform_device *pdev; /* The configuration */ struct gpiommc_platform_data pdata; @@ -12,7 +12,7 @@ does not lock access between files. }; #define GPIO_INVALID -1 -@@ -233,6 +235,8 @@ +@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show( unsigned int gpio; int err = 0; @@ -21,7 +21,7 @@ does not lock access between files. if (attr == &gpiommc_attr_DI) { gpio = dev->pdata.pins.gpio_di; if (gpio == GPIO_INVALID) -@@ -293,6 +297,8 @@ +@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show( WARN_ON(1); err = -ENOSYS; out: @@ -30,7 +30,7 @@ does not lock access between files. return err ? err : count; } -@@ -352,6 +358,8 @@ +@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store int err = -EINVAL; unsigned long data; @@ -39,7 +39,7 @@ does not lock access between files. if (attr == &gpiommc_attr_register) { err = strict_strtoul(page, 10, &data); if (err) -@@ -477,6 +485,8 @@ +@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store WARN_ON(1); err = -ENOSYS; out: @@ -48,7 +48,7 @@ does not lock access between files. return err ? err : count; } -@@ -513,6 +523,7 @@ +@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_ if (!dev) return NULL; |