From 4b7f8422351ce1c30e4bd17017682021215957f6 Mon Sep 17 00:00:00 2001 From: Ohad Ben-Cohen Date: Sun, 17 Jul 2011 16:38:21 +0100 Subject: [PATCH] --- yaml --- r: 255244 b: refs/heads/master c: ecc024419a13da1e589aebc422d9d1e3c0124ba4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/sdio_bus.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8312a7fccdfc..9d4bc2ba01be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0a68ec9444384269ec06b474c0a841ccd6fcdf9 +refs/heads/master: ecc024419a13da1e589aebc422d9d1e3c0124ba4 diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c index d2565df8a7fb..e4e6822d09e3 100644 --- a/trunk/drivers/mmc/core/sdio_bus.c +++ b/trunk/drivers/mmc/core/sdio_bus.c @@ -167,11 +167,8 @@ static int sdio_bus_remove(struct device *dev) int ret = 0; /* Make sure card is powered before invoking ->remove() */ - if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) { - ret = pm_runtime_get_sync(dev); - if (ret < 0) - goto out; - } + if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) + pm_runtime_get_sync(dev); drv->remove(func); @@ -191,7 +188,6 @@ static int sdio_bus_remove(struct device *dev) if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) pm_runtime_put_sync(dev); -out: return ret; }