aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
index 1d0f5ba651..e68d4ab014 100644
--- a/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
@@ -1,9 +1,11 @@
The gpiommc configfs context structure needs locking, as configfs
does not lock access between files.
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@
+Index: linux-2.6.25.17/drivers/mmc/host/gpiommc.c
+===================================================================
+--- linux-2.6.25.17.orig/drivers/mmc/host/gpiommc.c 2008-10-18 23:33:54.000000000 +0200
++++ linux-2.6.25.17/drivers/mmc/host/gpiommc.c 2008-10-18 23:34:33.000000000 +0200
+@@ -140,6 +140,8 @@ struct gpiommc_configfs_device {
struct platform_device *pdev;
/* The configuration */
struct gpiommc_platform_data pdata;
@@ -12,7 +14,7 @@ does not lock access between files.
};
#define GPIO_INVALID -1
-@@ -233,6 +235,8 @@
+@@ -230,6 +232,8 @@ static ssize_t gpiommc_config_attr_show(
unsigned int gpio;
int err = 0;
@@ -21,7 +23,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 @@
+@@ -290,6 +294,8 @@ static ssize_t gpiommc_config_attr_show(
WARN_ON(1);
err = -ENOSYS;
out:
@@ -30,7 +32,7 @@ does not lock access between files.
return err ? err : count;
}
-@@ -352,6 +358,8 @@
+@@ -349,6 +355,8 @@ static ssize_t gpiommc_config_attr_store
int err = -EINVAL;
unsigned long data;
@@ -39,7 +41,7 @@ does not lock access between files.
if (attr == &gpiommc_attr_register) {
err = strict_strtoul(page, 10, &data);
if (err)
-@@ -477,6 +485,8 @@
+@@ -474,6 +482,8 @@ static ssize_t gpiommc_config_attr_store
WARN_ON(1);
err = -ENOSYS;
out:
@@ -48,7 +50,7 @@ does not lock access between files.
return err ? err : count;
}
-@@ -513,6 +523,7 @@
+@@ -510,6 +520,7 @@ static struct config_item *gpiommc_make_
if (!dev)
return NULL;