diff mbox

[1/6] mmc: Fix use of wrong device in mmc_gpiod_free_cd()

Message ID 1411502430-25535-2-git-send-email-adrian.hunter@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Adrian Hunter Sept. 23, 2014, 8 p.m. UTC
mmc_gpiod_free_cd() is paired with mmc_gpiod_request_cd()
and both must reference the same device which is the
actual host controller device not the mmc_host class
device.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/core/slot-gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson Sept. 29, 2014, 9:44 a.m. UTC | #1
On 23 September 2014 22:00, Adrian Hunter <adrian.hunter@intel.com> wrote:
> mmc_gpiod_free_cd() is paired with mmc_gpiod_request_cd()
> and both must reference the same device which is the
> actual host controller device not the mmc_host class
> device.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Thanks! Applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/core/slot-gpio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
> index e3fce44..06616cd 100644
> --- a/drivers/mmc/core/slot-gpio.c
> +++ b/drivers/mmc/core/slot-gpio.c
> @@ -392,7 +392,7 @@ void mmc_gpiod_free_cd(struct mmc_host *host)
>                 host->slot.cd_irq = -EINVAL;
>         }
>
> -       devm_gpiod_put(&host->class_dev, ctx->cd_gpio);
> +       devm_gpiod_put(host->parent, ctx->cd_gpio);
>
>         ctx->cd_gpio = NULL;
>  }
> --
> 1.8.3.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index e3fce44..06616cd 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -392,7 +392,7 @@  void mmc_gpiod_free_cd(struct mmc_host *host)
 		host->slot.cd_irq = -EINVAL;
 	}
 
-	devm_gpiod_put(&host->class_dev, ctx->cd_gpio);
+	devm_gpiod_put(host->parent, ctx->cd_gpio);
 
 	ctx->cd_gpio = NULL;
 }