diff options
| author | Philip Rakity <prakity@marvell.com> | 2012-05-28 03:36:33 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-07-21 06:02:23 +0200 |
| commit | 0aa6770000bafa65c17cf44b6619d328d4fc79b3 (patch) | |
| tree | 58ac3bff5d06e706ad38f9ccc8acb39b02301938 /drivers/mmc/host | |
| parent | mmc: sdhci: if MAX_CURRENT is 0, try getting current from regulator (diff) | |
| download | linux-0aa6770000bafa65c17cf44b6619d328d4fc79b3.tar.xz linux-0aa6770000bafa65c17cf44b6619d328d4fc79b3.zip | |
mmc: sdhci: only set 200mA support for 1.8v if 200mA is available
max_current_caps can return 0 if not available from the sd controller.
If no regulator is present or the regulator specifies a current
less then 200ma, we no longer still set the 200mA caps bit anyway.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Reviewed-by: Aaron Lu <aaron_lu@amd.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a0853d03b330..8f61f8d6e0ca 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2914,7 +2914,7 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_MAX_CURRENT_600; else if (max_current_180 >= 400) mmc->caps |= MMC_CAP_MAX_CURRENT_400; - else + else if (max_current_180 >= 200) mmc->caps |= MMC_CAP_MAX_CURRENT_200; } |