diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-08 22:19:31 +0000 | 
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-08 22:19:31 +0000 | 
| commit | cb5bddeee233e4d33857b5dd46cf2bc906e7fd19 (patch) | |
| tree | eca211bce457b867f3e5fd2acded634db17c76cf /target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch | |
| parent | c06bcf1ccd80e46f0e162047a716c7dc40dd8324 (diff) | |
kernel: add support for 3.8-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35055 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch')
| -rw-r--r-- | target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch | 58 | 
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch new file mode 100644 index 000000000..d4201eb50 --- /dev/null +++ b/target/linux/generic/patches-3.8/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 = strict_strtoul(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); +   | 
