lkml.org 
[lkml]   [2013]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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 |

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-04-09 19:01    [W:0.078 / U:1.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site