dma: mic_x100: add missing spin_unlock
PATCH 1/1 dma: mic_x100: add missing spin_unlock
spin lock should be released while returning from function
Signed-off-by Saurabh Sengar <[email protected]>
--- drivers/dma/mic_x100_dma.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/dma/mic_x100_dma.c +11 -6
@@ -317,17 +317,21 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,struct mic_dma_chan *mic_ch =to_mic_dma_chan (ch);struct device *dev =mic_dma_ch_to_device (mic_ch);int result; +struct dma_async_tx_descriptor *tx =NULL ;if (!len && !flags) -return NULL ; +return tx;spin_lock (&mic_ch->prep_lock); result =mic_dma_do_dma (mic_ch, flags, dma_src, dma_dest, len);if (result >=0 ) -return allocate_tx (mic_ch); -dev_err (dev,"Error enqueueing dma, error=%d\n" , result); + tx =allocate_tx (mic_ch); + +if (!tx) +dev_err (dev,"Error enqueueing dma, error=%d\n" , result); +spin_unlock (&mic_ch->prep_lock); -return NULL ; +return tx; } static struct dma_async_tx_descriptor *
@@ -335,13 +339,14 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags) {struct mic_dma_chan *mic_ch =to_mic_dma_chan (ch);int ret; +struct dma_async_tx_descriptor *tx =NULL ;spin_lock (&mic_ch->prep_lock); ret =mic_dma_do_dma (mic_ch, flags,0 ,0 ,0 );if (!ret) -return allocate_tx (mic_ch); + tx =allocate_tx (mic_ch);spin_unlock (&mic_ch->prep_lock); -return NULL ; +return tx; }/* Return the status of the transaction */
Signature · 1 line
1.9.1
Quoted 12 lines · Saurabh Sengar
spin lock should be released while returning from function
Signed-off-by Saurabh Sengar <[email protected]>--- drivers/dma/mic_x100_dma.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)drivers/dma/mic_x100_dma.c +0
-0
drivers/dma/mic_x100_dma.c mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest, · line 323
Quoted 8 lines
drivers/dma/mic_x100_dma.c +2
-1@@ -317,17 +317,21 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,struct mic_dma_chan *mic_ch =to_mic_dma_chan (ch);struct device *dev =mic_dma_ch_to_device (mic_ch);int result; +struct dma_async_tx_descriptor *tx =NULL ;if (!len && !flags) -return NULL ; +return tx;
This one doesn't make sense, tx will be NULL here, so orignal one is fine
Quoted 37 lines
drivers/dma/mic_x100_dma.c +9
-5spin_lock (&mic_ch->prep_lock); result =mic_dma_do_dma (mic_ch, flags, dma_src, dma_dest, len);if (result >=0 ) -return allocate_tx (mic_ch); -dev_err (dev,"Error enqueueing dma, error=%d\n" , result); + tx =allocate_tx (mic_ch); + +if (!tx) +dev_err (dev,"Error enqueueing dma, error=%d\n" , result); +spin_unlock (&mic_ch->prep_lock); -return NULL ; +return tx; } static struct dma_async_tx_descriptor *@@ -335,13 +339,14 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags) {struct mic_dma_chan *mic_ch =to_mic_dma_chan (ch);int ret; +struct dma_async_tx_descriptor *tx =NULL ;spin_lock (&mic_ch->prep_lock); ret =mic_dma_do_dma (mic_ch, flags,0 ,0 ,0 );if (!ret) -return allocate_tx (mic_ch); + tx =allocate_tx (mic_ch);spin_unlock (&mic_ch->prep_lock); -return NULL ; +return tx; }/* Return the status of the transaction */ Signature · 1 line
1.9.1
Signature · 1 line
~Vinod
PATCH v2 1/1 dma: mic_x100: add missing spin_unlock
spin lock should be released while returning from function
Signed-off-by Saurabh Sengar <[email protected]>
---
v2: fixed comment from Vinod Koul
drivers/dma/mic_x100_dma.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/dma/mic_x100_dma.c +10 -5
@@ -317,6 +317,7 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,struct mic_dma_chan *mic_ch =to_mic_dma_chan (ch);struct device *dev =mic_dma_ch_to_device (mic_ch);int result; +struct dma_async_tx_descriptor *tx =NULL ;if (!len && !flags)return NULL ;
@@ -324,10 +325,13 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,spin_lock (&mic_ch->prep_lock); result =mic_dma_do_dma (mic_ch, flags, dma_src, dma_dest, len);if (result >=0 ) -return allocate_tx (mic_ch); -dev_err (dev,"Error enqueueing dma, error=%d\n" , result); + tx =allocate_tx (mic_ch); + +if (!tx) +dev_err (dev,"Error enqueueing dma, error=%d\n" , result); +spin_unlock (&mic_ch->prep_lock); -return NULL ; +return tx; } static struct dma_async_tx_descriptor *
@@ -335,13 +339,14 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags) {struct mic_dma_chan *mic_ch =to_mic_dma_chan (ch);int ret; +struct dma_async_tx_descriptor *tx =NULL ;spin_lock (&mic_ch->prep_lock); ret =mic_dma_do_dma (mic_ch, flags,0 ,0 ,0 );if (!ret) -return allocate_tx (mic_ch); + tx =allocate_tx (mic_ch);spin_unlock (&mic_ch->prep_lock); -return NULL ; +return tx; }/* Return the status of the transaction */
Signature · 1 line
1.9.1
Quoted 1 line · Saurabh Sengar
spin lock should be released while returning from function
Applying after fixing the subsytem name
Signature · 1 line
~Vinod