diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:37 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:37 +0000 |
commit | 4f1451b47e0483c21393b13f82d5eb24d3fb17f2 (patch) | |
tree | c3e80a16d0b4070af1ea473d644981d1df410c54 /target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch | |
parent | 7e71e51d60fc258c9c4cb2dc07ad9c3736c59a66 (diff) | |
download | master-187ad058-4f1451b47e0483c21393b13f82d5eb24d3fb17f2.tar.gz master-187ad058-4f1451b47e0483c21393b13f82d5eb24d3fb17f2.tar.bz2 master-187ad058-4f1451b47e0483c21393b13f82d5eb24d3fb17f2.zip |
linux/3.2: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch')
-rw-r--r-- | target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch deleted file mode 100644 index d4201eb508..0000000000 --- a/target/linux/generic/patches-3.2/864-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 -@@ -144,6 +144,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 -@@ -234,6 +236,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) -@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show( - WARN_ON(1); - err = -ENOSYS; - out: -+ mutex_unlock(&dev->mutex); -+ - return err ? err : count; - } - -@@ -353,6 +359,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) -@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store - WARN_ON(1); - err = -ENOSYS; - out: -+ mutex_unlock(&dev->mutex); -+ - return err ? err : count; - } - -@@ -514,6 +524,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); - |