diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
commit | 127e4ebd32d51070fd5763e4d50aba211b02de6a (patch) | |
tree | 510a31b05cfa6ae4477fd738371cc12d3df27853 /target/linux/generic/patches-2.6.39/923-gpiommc-configfs-locking.patch | |
parent | 512bb389ee6125135c6da818686f98774191b457 (diff) | |
download | upstream-127e4ebd32d51070fd5763e4d50aba211b02de6a.tar.gz upstream-127e4ebd32d51070fd5763e4d50aba211b02de6a.tar.bz2 upstream-127e4ebd32d51070fd5763e4d50aba211b02de6a.zip |
generic: Add support for 2.6.39
Add support for 2.6.39 based on rc3. Runtime tested on bcm63xx.
SVN-Revision: 26615
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.patch | 58 |
1 files changed, 58 insertions, 0 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 new file mode 100644 index 0000000000..2e4e820b2b --- /dev/null +++ b/target/linux/generic/patches-2.6.39/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); + |