summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-27 15:01:37 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-27 15:01:37 +0000
commit0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c (patch)
treed82196ea551155c8f21cfa5fef4fa565d29f4b0b /target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch
parent20ba6d90e31707ee95630804a284c8bad8cc90ed (diff)
downloadmtk-20170518-0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c.zip
mtk-20170518-0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c.tar.gz
mtk-20170518-0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c.tar.bz2
linux/3.2: R.I.P.
SVN-Revision: 31905
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.patch58
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 d4201eb..0000000
--- 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);
-