The patch titled gpiommc: Add locking has been removed from the -mm tree. Its filename was mmc-add-gpio-based-mmc-sd-driver-add-locking.patch This patch was dropped because it was folded into mmc-add-gpio-based-mmc-sd-driver.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: gpiommc: Add locking From: Michael Buesch <mb@xxxxxxxxx> The gpiommc configfs context structure needs locking, as configfs does not lock access between files (or if it does, we shouldn't depend on this to magically happen). Signed-off-by: Michael Buesch <mb@xxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Cc: Pierre Ossman <drzeus-list@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/gpiommc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff -puN drivers/mmc/host/gpiommc.c~mmc-add-gpio-based-mmc-sd-driver-add-locking drivers/mmc/host/gpiommc.c --- a/drivers/mmc/host/gpiommc.c~mmc-add-gpio-based-mmc-sd-driver-add-locking +++ a/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; } @@ -514,6 +524,7 @@ static int gpiommc_make_item(struct conf if (!dev) return -ENOMEM; + mutex_init(&dev->mutex); config_item_init_type_name(&dev->item, name, &gpiommc_dev_ci_type); _ Patches currently in -mm which might be from mb@xxxxxxxxx are origin.patch spi-add-spi-over-gpio-driver.patch mmc-add-gpio-based-mmc-sd-driver.patch mmc-add-gpio-based-mmc-sd-driver-add-locking.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html