diff options
Diffstat (limited to 'drivers/dma/ipu')
-rw-r--r-- | drivers/dma/ipu/ipu_idmac.c | 2 | ||||
-rw-r--r-- | drivers/dma/ipu/ipu_irq.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index 65855373cee6..8c61d17a86bf 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c | |||
@@ -1347,7 +1347,7 @@ static struct dma_async_tx_descriptor *idmac_prep_slave_sg(struct dma_chan *chan | |||
1347 | chan->chan_id != IDMAC_IC_7) | 1347 | chan->chan_id != IDMAC_IC_7) |
1348 | return NULL; | 1348 | return NULL; |
1349 | 1349 | ||
1350 | if (direction != DMA_DEV_TO_MEM && direction != DMA_MEM_TO_DEV) { | 1350 | if (!is_slave_direction(direction)) { |
1351 | dev_err(chan->device->dev, "Invalid DMA direction %d!\n", direction); | 1351 | dev_err(chan->device->dev, "Invalid DMA direction %d!\n", direction); |
1352 | return NULL; | 1352 | return NULL; |
1353 | } | 1353 | } |
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index a5ee37d5320f..2e284a4438bc 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c | |||
@@ -44,7 +44,6 @@ static void ipu_write_reg(struct ipu *ipu, u32 value, unsigned long reg) | |||
44 | struct ipu_irq_bank { | 44 | struct ipu_irq_bank { |
45 | unsigned int control; | 45 | unsigned int control; |
46 | unsigned int status; | 46 | unsigned int status; |
47 | spinlock_t lock; | ||
48 | struct ipu *ipu; | 47 | struct ipu *ipu; |
49 | }; | 48 | }; |
50 | 49 | ||