X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/08bed5460c93e080498f5f348b9a8ff693ee7bff..d2c03b9bffdd01672ff178d2b1a8a93576aaffbb:/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch

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 79a4acb50..c84f62b44 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,11 +1,9 @@
 The gpiommc configfs context structure needs locking, as configfs
 does not lock access between files.
 
-Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
-===================================================================
---- linux-2.6.25.10.orig/drivers/mmc/host/gpiommc.c	2008-07-21 11:57:01.000000000 +0200
-+++ linux-2.6.25.10/drivers/mmc/host/gpiommc.c	2008-07-21 12:01:33.000000000 +0200
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -140,6 +140,8 @@ struct gpiommc_configfs_device {
  	struct platform_device *pdev;
  	/* The configuration */
  	struct gpiommc_platform_data pdata;
@@ -14,7 +12,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
  };
  
  #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
+@@ -230,6 +232,8 @@ static ssize_t gpiommc_config_attr_show(
  	unsigned int gpio;
  	int err = 0;
  
@@ -23,7 +21,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
  	if (attr == &gpiommc_attr_DI) {
  		gpio = dev->pdata.pins.gpio_di;
  		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
+@@ -290,6 +294,8 @@ static ssize_t gpiommc_config_attr_show(
  	WARN_ON(1);
  	err = -ENOSYS;
  out:
@@ -32,7 +30,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
  	return err ? err : count;
  }
  
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
+@@ -349,6 +355,8 @@ static ssize_t gpiommc_config_attr_store
  	int err = -EINVAL;
  	unsigned long data;
  
@@ -41,7 +39,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
  	if (attr == &gpiommc_attr_register) {
  		err = strict_strtoul(page, 10, &data);
  		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
+@@ -474,6 +482,8 @@ static ssize_t gpiommc_config_attr_store
  	WARN_ON(1);
  	err = -ENOSYS;
  out:
@@ -50,7 +48,7 @@ Index: linux-2.6.25.10/drivers/mmc/host/gpiommc.c
  	return err ? err : count;
  }
  
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
+@@ -510,6 +520,7 @@ static struct config_item *gpiommc_make_
  	if (!dev)
  		return NULL;