Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16605e8d authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Vinod Koul
Browse files

dmaengine: Revert "dmaengine: mic_x100: add missing spin_unlock" 



This reverts commit e958e079 ("dmaengine: mic_x100: add missing
spin_unlock").

The above patch is incorrect. There is nothing wrong with the original
code. The spin_lock is acquired in the "prep" functions and released
in "submit".

Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 16830985

drivers/dma/mic_x100_dma.c

+5 −10
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ 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;
@@ -325,13 +324,10 @@ 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)

		tx = allocate_tx(mic_ch);



	if (!tx)

		return allocate_tx(mic_ch);

	dev_err(dev, "Error enqueueing dma, error=%d\n", result);



	spin_unlock(&mic_ch->prep_lock);

	return tx;

	return NULL;

}



static struct dma_async_tx_descriptor *
@@ -339,14 +335,13 @@ 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)

		tx = allocate_tx(mic_ch);

		return allocate_tx(mic_ch);

	spin_unlock(&mic_ch->prep_lock);

	return tx;

	return NULL;

}



/* Return the status of the transaction */