[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51644302.6000109@pengutronix.de>
Date: Tue, 09 Apr 2013 18:34:10 +0200
From: Marc Kleine-Budde <mkl@...gutronix.de>
To: Hector Palacios <hector.palacios@...i.com>
CC: linux-mmc@...r.kernel.org, kernel@...gutronix.de, cjb@...top.org,
aletes.xgr@...il.com,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Marek Vasut <marex@...x.de>, Shawn Guo <shawn.guo@...aro.org>
Subject: Re: [PATCH v2 2/2] mmc: mxs-mmc: add non-removable property
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 |
Download attachment "signature.asc" of type "application/pgp-signature" (264 bytes)
Powered by blists - more mailing lists