| Message ID | 1446752813-26718-1-git-send-email-robert.jarzmik@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 5 November 2015 at 20:46, Robert Jarzmik <robert.jarzmik@free.fr> wrote: > The commit converting pxamci to slot-gpio API inverted the logic of the > read-only gpio. Fix it by inverting the logic again. > > Fixes: fd546ee6a7dc ("mmc: pxamci: fix card detect with slot-gpio API") > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > Cc: stable@vger.kernel.org Thanks, applied for fixes! Kind regards Uffe > --- > drivers/mmc/host/pxamci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c > index 8cadd74e8407..ce08896b9d69 100644 > --- a/drivers/mmc/host/pxamci.c > +++ b/drivers/mmc/host/pxamci.c > @@ -805,7 +805,7 @@ static int pxamci_probe(struct platform_device *pdev) > goto out; > } else { > mmc->caps |= host->pdata->gpio_card_ro_invert ? > - MMC_CAP2_RO_ACTIVE_HIGH : 0; > + 0 : MMC_CAP2_RO_ACTIVE_HIGH; > } > > if (gpio_is_valid(gpio_cd)) > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 8cadd74e8407..ce08896b9d69 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -805,7 +805,7 @@ static int pxamci_probe(struct platform_device *pdev) goto out; } else { mmc->caps |= host->pdata->gpio_card_ro_invert ? - MMC_CAP2_RO_ACTIVE_HIGH : 0; + 0 : MMC_CAP2_RO_ACTIVE_HIGH; } if (gpio_is_valid(gpio_cd))
The commit converting pxamci to slot-gpio API inverted the logic of the read-only gpio. Fix it by inverting the logic again. Fixes: fd546ee6a7dc ("mmc: pxamci: fix card detect with slot-gpio API") Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: stable@vger.kernel.org --- drivers/mmc/host/pxamci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)