Skip to contentSkip to conversation

ASoC: sst-haswell-ipc: restore IRQs on error

PATCH Applied Dan Carpenter 3 participants 3 messages Feb 25, 2014

Subsystems (4)
Sound Kernel janitors ASoC Intel ASoC drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/2 ASoC: sst-haswell-ipc: restore IRQs on error

This should be spin_unlock_irqrestore() instead of spin_unlock()

Fixes 22981243589c ('ASoC: Intel: Add Haswell/Broadwell IPC')
Signed-off-by Dan Carpenter <[email protected]>
sound/soc/intel/sst-haswell-ipc.c +1 -1
index 668d486520ae..552aebf2c8f5 100644
@@ -527,7 +527,7 @@ static int ipc_tx_message(struct sst_hsw *hsw, u32 header, void *tx_data,
 
 	msg = msg_get_empty(hsw);
 	if (msg = NULL) {
-		spin_unlock(&hsw->dsp->spinlock);
+		spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
 		return -EBUSY;
 	}
Acked-by on v1 1/2
#1 lore raw
Quoted 10 lines · Dan Carpenter

This should be spin_unlock_irqrestore() instead of spin_unlock()

Fixes 22981243589c ('ASoC: Intel: Add Haswell/Broadwell IPC')
Signed-off-by Dan Carpenter <[email protected]>
sound/soc/intel/sst-haswell-ipc.c +0 -0
index 668d486520ae..552aebf2c8f5 100644

sound/soc/intel/sst-haswell-ipc.c static int ipc_tx_message(struct sst_hsw *hsw, u32 header, void *tx_data, · line 533

Quoted 8 lines
sound/soc/intel/sst-haswell-ipc.c +1 -1
@@ -527,7 +527,7 @@ static int ipc_tx_message(struct sst_hsw *hsw, u32 header, void *tx_data,
 
 	msg = msg_get_empty(hsw);
 	if (msg == NULL) {
-		spin_unlock(&hsw->dsp->spinlock);
+		spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
 		return -EBUSY;
 	}

Both

Acked-by Liam Girdwood <[email protected]>

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.