summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-16 18:31:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-16 18:31:05 +0000
commit3fa43f54a267f45e42be641945573450a0a419b8 (patch)
treeafa65eace467c96d7b49262ac89892f8d8f977b6 /target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch
parent71d8c66250eef1806d680a27d175c61dd9971a5e (diff)
downloadmaster-31e0f0ae-3fa43f54a267f45e42be641945573450a0a419b8.tar.gz
master-31e0f0ae-3fa43f54a267f45e42be641945573450a0a419b8.tar.bz2
master-31e0f0ae-3fa43f54a267f45e42be641945573450a0a419b8.zip
kernel: reorganize 2.6.39 patches
SVN-Revision: 26691
Diffstat (limited to 'target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch b/target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic/patches-2.6.39/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
-@@ -143,6 +143,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
-@@ -233,6 +235,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)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- WARN_ON(1);
- err = -ENOSYS;
- out:
-+ mutex_unlock(&dev->mutex);
-+
- return err ? err : count;
- }
-
-@@ -352,6 +358,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)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- WARN_ON(1);
- err = -ENOSYS;
- out:
-+ mutex_unlock(&dev->mutex);
-+
- return err ? err : count;
- }
-
-@@ -513,6 +523,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);
-