On 04/09/2013 05:21 PM, Hector Palacios wrote: > On 04/09/2013 05:14 PM, Hector Palacios wrote: >> @@ -95,7 +97,8 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) >> struct mxs_mmc_host *host = mmc_priv(mmc); >> struct mxs_ssp *ssp = &host->ssp; >> >> - return !(readl(ssp->base + HW_SSP_STATUS(ssp)) & >> + return host->non_removable || host->broken_cd || >> + !(readl(ssp->base + HW_SSP_STATUS(ssp)) & >> BM_SSP_STATUS_CARD_DETECT); >> } > > Sorry, I missed your original XOR here, when merging my changes:
Can you send an incremental patch against my 2/2 with your Signed-off-by, I'll squash your patch into mine and repost the series. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
