summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-10 08:19:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-10 08:19:25 +0000
commitabeab97efc267a2855a6b5afb9d0c86c192900a0 (patch)
treec7b628639d36a879a716bf9f012a8d2548277c49 /target/linux/generic
parent69593176911e2ca512d526c91300df1fd2b42bc0 (diff)
downloadmtk-20170518-abeab97efc267a2855a6b5afb9d0c86c192900a0.zip
mtk-20170518-abeab97efc267a2855a6b5afb9d0c86c192900a0.tar.gz
mtk-20170518-abeab97efc267a2855a6b5afb9d0c86c192900a0.tar.bz2
ar71xx: refresh 3.2 patches
SVN-Revision: 30402
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch
index 2e4e820..d4201eb 100644
--- a/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch
+++ b/target/linux/generic/patches-3.2/864-gpiommc_configfs_locking.patch
@@ -3,7 +3,7 @@ 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 {
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
struct platform_device *pdev;
/* The configuration */
struct gpiommc_platform_data pdata;
@@ -12,7 +12,7 @@ does not lock access between files.
};
#define GPIO_INVALID -1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
unsigned int gpio;
int err = 0;
@@ -21,7 +21,7 @@ does not lock access between files.
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(
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
WARN_ON(1);
err = -ENOSYS;
out:
@@ -30,7 +30,7 @@ does not lock access between files.
return err ? err : count;
}
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
int err = -EINVAL;
unsigned long data;
@@ -39,7 +39,7 @@ does not lock access between files.
if (attr == &gpiommc_attr_register) {
err = strict_strtoul(page, 10, &data);
if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
WARN_ON(1);
err = -ENOSYS;
out:
@@ -48,7 +48,7 @@ does not lock access between files.
return err ? err : count;
}
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
if (!dev)
return NULL;