| Message ID | 20161113142912.4041-2-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Sun, Nov 13, 2016 at 03:29:11PM +0100, Wolfram Sang wrote: > Commit 7729c7a232a953 ("mmc: tmio: Provide separate interrupt handlers") > refactored the sdio irq handler and wrongly used the mask for SD irqs, > not for SDIO irqs. This doesn't really matter in practice because both > values keep the only interrupt we are interested in. But still, this is > wrong and wants to be fixed. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/mmc/host/tmio_mmc_pio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index dbc3cb14f3321b..2b04e6e87192c7 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -741,7 +741,7 @@ static void tmio_mmc_sdio_irq(int irq, void *devid) > return; > > status = sd_ctrl_read16(host, CTL_SDIO_STATUS); > - ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask; > + ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; > > sdio_status = status & ~TMIO_SDIO_MASK_ALL; > if (pdata->flags & TMIO_MMC_SDIO_STATUS_QUIRK) > -- > 2.9.3 >
On 13 November 2016 at 15:29, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > Commit 7729c7a232a953 ("mmc: tmio: Provide separate interrupt handlers") > refactored the sdio irq handler and wrongly used the mask for SD irqs, > not for SDIO irqs. This doesn't really matter in practice because both > values keep the only interrupt we are interested in. But still, this is > wrong and wants to be fixed. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/tmio_mmc_pio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index dbc3cb14f3321b..2b04e6e87192c7 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -741,7 +741,7 @@ static void tmio_mmc_sdio_irq(int irq, void *devid) > return; > > status = sd_ctrl_read16(host, CTL_SDIO_STATUS); > - ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask; > + ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; > > sdio_status = status & ~TMIO_SDIO_MASK_ALL; > if (pdata->flags & TMIO_MMC_SDIO_STATUS_QUIRK) > -- > 2.9.3 > > -- > 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/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index dbc3cb14f3321b..2b04e6e87192c7 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -741,7 +741,7 @@ static void tmio_mmc_sdio_irq(int irq, void *devid) return; status = sd_ctrl_read16(host, CTL_SDIO_STATUS); - ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask; + ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; sdio_status = status & ~TMIO_SDIO_MASK_ALL; if (pdata->flags & TMIO_MMC_SDIO_STATUS_QUIRK)
Commit 7729c7a232a953 ("mmc: tmio: Provide separate interrupt handlers") refactored the sdio irq handler and wrongly used the mask for SD irqs, not for SDIO irqs. This doesn't really matter in practice because both values keep the only interrupt we are interested in. But still, this is wrong and wants to be fixed. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/mmc/host/tmio_mmc_pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)