summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-03-07 11:27:00 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-03-07 11:27:00 +0000
commit074af75668dd491042b07a26059927da38f13663 (patch)
tree58362fbaa56de52bda6c4aafc825d5bf5c40ec09 /target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch
parent96fa58bafd6b311a9a3686b704bf8074905c4bea (diff)
downloadmtk-20170518-074af75668dd491042b07a26059927da38f13663.zip
mtk-20170518-074af75668dd491042b07a26059927da38f13663.tar.gz
mtk-20170518-074af75668dd491042b07a26059927da38f13663.tar.bz2
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 39789
Diffstat (limited to 'target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch')
-rw-r--r--target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch
new file mode 100644
index 0000000..92815d9
--- /dev/null
+++ b/target/linux/generic/patches-3.14/864-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
+@@ -144,6 +144,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
+@@ -234,6 +236,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)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ WARN_ON(1);
+ err = -ENOSYS;
+ out:
++ mutex_unlock(&dev->mutex);
++
+ return err ? err : count;
+ }
+
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ int err = -EINVAL;
+ unsigned long data;
+
++ mutex_lock(&dev->mutex);
++
+ if (attr == &gpiommc_attr_register) {
+ err = kstrtoul(page, 10, &data);
+ if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ WARN_ON(1);
+ err = -ENOSYS;
+ out:
++ mutex_unlock(&dev->mutex);
++
+ return err ? err : count;
+ }
+
+@@ -514,6 +524,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);
+