Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0

This commit is contained in:
yxj
2011-11-19 18:39:57 +08:00

View File

@@ -696,7 +696,7 @@ void rk29_sdmmc_set_frq(struct rk29_sdmmc *host)
card = (struct mmc_card *)mmchost->card;
ios = ( struct mmc_ios *)&mmchost->ios;
if(!card && !ios)
if(!card || !ios)
return;
if(MMC_POWER_ON == ios->power_mode)