diff mbox

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

Message ID 20140225083250.GA22416@elgon.mountain (mailing list archive)
State Accepted
Commit f9da9e434d9dad684aec159a74b9c8436d4faf5a
Headers show

Commit Message

Dan Carpenter Feb. 25, 2014, 8:32 a.m. UTC 
This should be spin_unlock_irqrestore() instead of spin_unlock()

Fixes: 22981243589c ('ASoC: Intel: Add Haswell/Broadwell IPC')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Girdwood, Liam R Feb. 25, 2014, 1:12 p.m. UTC | #1 
On Tue, 2014-02-25 at 11:32 +0300, Dan Carpenter wrote:
> This should be spin_unlock_irqrestore() instead of spin_unlock()
> 
> Fixes: 22981243589c ('ASoC: Intel: Add Haswell/Broadwell IPC')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
> index 668d486520ae..552aebf2c8f5 100644
> --- a/sound/soc/intel/sst-haswell-ipc.c
> +++ b/sound/soc/intel/sst-haswell-ipc.c
> @@ -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 <liam.r.girdwood@linux.intel.com>


---------------------------------------------------------------------
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.
Mark Brown Feb. 25, 2014, 11:46 p.m. UTC | #2 
On Tue, Feb 25, 2014 at 11:32:50AM +0300, Dan Carpenter wrote:
> This should be spin_unlock_irqrestore() instead of spin_unlock()

Applied both, thanks.
diff mbox

Patch

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index 668d486520ae..552aebf2c8f5 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -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;
 	}