diff options
| author | Tom Rini <trini@ti.com> | 2014-11-07 16:18:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-07 16:18:35 -0500 |
| commit | cfa1bd0774eafcba4791bad4d66f01b8f0dc6f94 (patch) | |
| tree | 13740fe096447814d65871bc9c15bbac26b0e854 /drivers/mmc/omap_hsmmc.c | |
| parent | 11ada9225a16ed2d8ddbf0715a2416245a777cbc (diff) | |
| parent | 40bbd52a79bdf2175a2e44272bead2bc194a3293 (diff) | |
Merge git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/mmc/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/omap_hsmmc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index ef2cbf9e2fa..ffb5284a00e 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -611,7 +611,8 @@ static int omap_hsmmc_getcd(struct mmc *mmc) if (cd_gpio < 0) return 1; - return gpio_get_value(cd_gpio); + /* NOTE: assumes card detect signal is active-low */ + return !gpio_get_value(cd_gpio); } static int omap_hsmmc_getwp(struct mmc *mmc) @@ -624,6 +625,7 @@ static int omap_hsmmc_getwp(struct mmc *mmc) if (wp_gpio < 0) return 0; + /* NOTE: assumes write protect signal is active-high */ return gpio_get_value(wp_gpio); } #endif |