diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2010-11-22 13:43:32 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2010-11-22 13:43:32 +0000 |
commit | 5ea6194ab0335f9c7351784b181bd3fd038fed47 (patch) | |
tree | bffe5acc557ca734671f310edd303acf11c7fc5b /target/linux/generic/patches-2.6.25/923-gpiommc-configfs-locking.patch | |
parent | d6ea3e24d49f94051305b5191edd10d213f92bf3 (diff) | |
download | upstream-5ea6194ab0335f9c7351784b181bd3fd038fed47.tar.gz upstream-5ea6194ab0335f9c7351784b181bd3fd038fed47.tar.bz2 upstream-5ea6194ab0335f9c7351784b181bd3fd038fed47.zip |
remove 2.6.25 support
SVN-Revision: 24089
Diffstat (limited to 'target/linux/generic/patches-2.6.25/923-gpiommc-configfs-locking.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.25/923-gpiommc-configfs-locking.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/target/linux/generic/patches-2.6.25/923-gpiommc-configfs-locking.patch b/target/linux/generic/patches-2.6.25/923-gpiommc-configfs-locking.patch deleted file mode 100644 index c84f62b447..0000000000 --- a/target/linux/generic/patches-2.6.25/923-gpiommc-configfs-locking.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 -@@ -140,6 +140,8 @@ struct gpiommc_configfs_device { - struct platform_device *pdev; - /* The configuration */ - struct gpiommc_platform_data pdata; -+ /* Mutex to protect this structure */ -+ struct mutex mutex; - }; - - #define GPIO_INVALID -1 -@@ -230,6 +232,8 @@ static ssize_t gpiommc_config_attr_show( - unsigned int gpio; - int err = 0; - -+ mutex_lock(&dev->mutex); -+ - if (attr == &gpiommc_attr_DI) { - gpio = dev->pdata.pins.gpio_di; - if (gpio == GPIO_INVALID) -@@ -290,6 +294,8 @@ static ssize_t gpiommc_config_attr_show( - WARN_ON(1); - err = -ENOSYS; - out: -+ mutex_unlock(&dev->mutex); -+ - return err ? err : count; - } - -@@ -349,6 +355,8 @@ static ssize_t gpiommc_config_attr_store - int err = -EINVAL; - unsigned long data; - -+ mutex_lock(&dev->mutex); -+ - if (attr == &gpiommc_attr_register) { - err = strict_strtoul(page, 10, &data); - if (err) -@@ -474,6 +482,8 @@ static ssize_t gpiommc_config_attr_store - WARN_ON(1); - err = -ENOSYS; - out: -+ mutex_unlock(&dev->mutex); -+ - return err ? err : count; - } - -@@ -510,6 +520,7 @@ static struct config_item *gpiommc_make_ - if (!dev) - return NULL; - -+ mutex_init(&dev->mutex); - config_item_init_type_name(&dev->item, name, - &gpiommc_dev_ci_type); - |