aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/923-gpiommc-configfs-locking.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-12-27 21:28:02 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-12-27 21:28:02 +0000
commit2434746dd4bc0c8c00d5a94e44f05604e2dca304 (patch)
tree180b2c74131eb4d4bd7c855e1de0ca28bda8127c /target/linux/generic-2.6/patches-2.6.28/923-gpiommc-configfs-locking.patch
parent4060780e57e972944be3a83db84bc37948949698 (diff)
downloadupstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.tar.gz
upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.tar.bz2
upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.zip
switch ixp4xx and ubicom32 to 2.6.30, get rid of 2.6.28 files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/923-gpiommc-configfs-locking.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/923-gpiommc-configfs-locking.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.28/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.28/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);
-