Re: [PATCH v2 2/2] mmc: mxs-mmc: add non-removable property

[Hector Palacios]

On Tue 09 Apr 2013 06:34:10 PM CEST, Marc Kleine-Budde wrote:
> 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.

Sure. Here it is: