diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-09-10 19:46:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-09-10 19:46:56 +0000 |
| commit | b23e70142db44f5a93b5da073c5df05b756c6fb4 (patch) | |
| tree | 4f7e42a3e8581abeb073ac49add469ca7f58dff3 /target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch | |
| parent | b17d6c1c7c7274ec165259081c0a29725bf1674d (diff) | |
| download | master-187ad058-b23e70142db44f5a93b5da073c5df05b756c6fb4.tar.gz master-187ad058-b23e70142db44f5a93b5da073c5df05b756c6fb4.tar.bz2 master-187ad058-b23e70142db44f5a93b5da073c5df05b756c6fb4.zip | |
[kernel] 2.6.26: add gpiommc driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch new file mode 100644 index 0000000000..1d0f5ba651 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch @@ -0,0 +1,58 @@ +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 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 @@ + 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 @@ + WARN_ON(1); + err = -ENOSYS; + out: ++ mutex_unlock(&dev->mutex); ++ + return err ? err : count; + } + +@@ -352,6 +358,8 @@ + 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 @@ + WARN_ON(1); + err = -ENOSYS; + out: ++ mutex_unlock(&dev->mutex); ++ + return err ? err : count; + } + +@@ -513,6 +523,7 @@ + if (!dev) + return NULL; + ++ mutex_init(&dev->mutex); + config_item_init_type_name(&dev->item, name, + &gpiommc_dev_ci_type); + |