| Message ID | 20200224171531.22204-1-frieder.schrempf@kontron.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | dma: imx-sdma: Fix the event id check to include RX event for UART6 | expand |
On 24.02.20 18:16, Schrempf Frieder wrote: > From: Frieder Schrempf <frieder.schrempf@kontron.de> > > On i.MX6 the DMA event for the RX channel of UART6 is '0'. To fix > the broken DMA support for UART6, we change the check for event_id0 > to include '0' as a valid id. > > Fixes: 1ec1e82f2510 ("dmaengine: Add Freescale i.MX SDMA support") > Cc: stable@vger.kernel Sorry, I messed up the stable tag. Will send again. > Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> > --- > drivers/dma/imx-sdma.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 066b21a32232..3d4aac97b1fc 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -1331,7 +1331,7 @@ static void sdma_free_chan_resources(struct dma_chan *chan) > > sdma_channel_synchronize(chan); > > - if (sdmac->event_id0) > + if (sdmac->event_id0 >= 0) > sdma_event_disable(sdmac, sdmac->event_id0); > if (sdmac->event_id1) > sdma_event_disable(sdmac, sdmac->event_id1); > @@ -1631,7 +1631,7 @@ static int sdma_config(struct dma_chan *chan, > memcpy(&sdmac->slave_config, dmaengine_cfg, sizeof(*dmaengine_cfg)); > > /* Set ENBLn earlier to make sure dma request triggered after that */ > - if (sdmac->event_id0) { > + if (sdmac->event_id0 >= 0) { > if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events) > return -EINVAL; > sdma_event_enable(sdmac, sdmac->event_id0); >
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 066b21a32232..3d4aac97b1fc 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1331,7 +1331,7 @@ static void sdma_free_chan_resources(struct dma_chan *chan) sdma_channel_synchronize(chan); - if (sdmac->event_id0) + if (sdmac->event_id0 >= 0) sdma_event_disable(sdmac, sdmac->event_id0); if (sdmac->event_id1) sdma_event_disable(sdmac, sdmac->event_id1); @@ -1631,7 +1631,7 @@ static int sdma_config(struct dma_chan *chan, memcpy(&sdmac->slave_config, dmaengine_cfg, sizeof(*dmaengine_cfg)); /* Set ENBLn earlier to make sure dma request triggered after that */ - if (sdmac->event_id0) { + if (sdmac->event_id0 >= 0) { if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events) return -EINVAL; sdma_event_enable(sdmac, sdmac->event_id0);