diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-04 07:12:50 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-04 07:12:50 (GMT) |
| commit | f68d891d85c8f9ab1af663ed3ceac18ad58dbabe (patch) | |
| tree | d92db7af512307ab5282eb62f3dd1741ac71d21f /drivers/mmc/core/sd.c | |
| parent | 5780b627e24113323427c102175296ae43dfb9d7 (diff) | |
| parent | 3fd877d32cac31292628fb8f443543fc1989b49b (diff) | |
| download | linux-f68d891d85c8f9ab1af663ed3ceac18ad58dbabe.tar.xz | |
Merge branch 'topic/hda-beep' into topic/hda
Diffstat (limited to 'drivers/mmc/core/sd.c')
| -rw-r--r-- | drivers/mmc/core/sd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index c272c686..b2b43f6 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1075,16 +1075,18 @@ static void mmc_sd_detect(struct mmc_host *host) */ static int mmc_sd_suspend(struct mmc_host *host) { + int err = 0; + BUG_ON(!host); BUG_ON(!host->card); mmc_claim_host(host); if (!mmc_host_is_spi(host)) - mmc_deselect_cards(host); + err = mmc_deselect_cards(host); host->card->state &= ~MMC_STATE_HIGHSPEED; mmc_release_host(host); - return 0; + return err; } /* |