diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-06 18:22:34 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-06 18:22:34 +0200 |
commit | a1e557bbdd984c5f41dab9a25649c5ea92eaafc3 (patch) | |
tree | 8e8fe9bea828bea9d091c49cd73903d132875205 /firmware/target | |
parent | 4be366f4b0d2611ec3b3668f4d4783bd917894dd (diff) | |
download | rockbox-a1e557bbdd984c5f41dab9a25649c5ea92eaafc3.tar.gz rockbox-a1e557bbdd984c5f41dab9a25649c5ea92eaafc3.zip |
imx233: fix horrible sd/mmc bug
The wrong variable was used to enumerate mmc drives. Also fix incorrect
function prototype.
Change-Id: Idd8dca7685bbc2bc4744b7b29e948f0ca2f56cc9
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/imx233/sdmmc-imx233.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c index 262589c544..7bc6d70cc9 100644 --- a/firmware/target/arm/imx233/sdmmc-imx233.c +++ b/firmware/target/arm/imx233/sdmmc-imx233.c | |||
@@ -865,7 +865,7 @@ int mmc_init(void) | |||
865 | int ret = sdmmc_init(); | 865 | int ret = sdmmc_init(); |
866 | if(ret < 0) return ret; | 866 | if(ret < 0) return ret; |
867 | 867 | ||
868 | _sd_num_drives = 0; | 868 | _mmc_num_drives = 0; |
869 | for(unsigned drive = 0; drive < SDMMC_NUM_DRIVES; drive++) | 869 | for(unsigned drive = 0; drive < SDMMC_NUM_DRIVES; drive++) |
870 | if(SDMMC_MODE(drive) == MMC_MODE) | 870 | if(SDMMC_MODE(drive) == MMC_MODE) |
871 | { | 871 | { |
@@ -936,8 +936,9 @@ bool mmc_disk_is_active(void) | |||
936 | return false; | 936 | return false; |
937 | } | 937 | } |
938 | 938 | ||
939 | bool mmc_usb_active(void) | 939 | bool mmc_usb_active(int delayticks) |
940 | { | 940 | { |
941 | (void) delayticks; | ||
941 | return mmc_disk_is_active(); | 942 | return mmc_disk_is_active(); |
942 | } | 943 | } |
943 | 944 | ||