diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-06-07 05:56:49 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-06-07 05:56:49 +0000 |
commit | 4503e77b0d53f912cbf9b32a14df71f61a9b1609 (patch) | |
tree | 14fd49a64056b8b9c39a14b92e06242d7801bc45 /target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch | |
parent | a2225b8b293cd71d420b96d46c88ad612f3637be (diff) | |
download | upstream-4503e77b0d53f912cbf9b32a14df71f61a9b1609.tar.gz upstream-4503e77b0d53f912cbf9b32a14df71f61a9b1609.tar.bz2 upstream-4503e77b0d53f912cbf9b32a14df71f61a9b1609.zip |
generic-2.6: add kernel 2.6.35 preliminary support (patches)
SVN-Revision: 21696
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch new file mode 100644 index 0000000000..2e4e820b2b --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.35/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 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); + |