From: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Date: Thu, 27 May 2010 05:53:53 +0000 (+1200)
Subject: ALSA: asihpi - Fix imbalanced lock path in hw_message
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bca516bfcfeb545e00bad3b6ca075d91c9c0b365;p=linux.git

ALSA: asihpi - Fix imbalanced lock path in hw_message

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 26b3b3f0a1526..12dab5e4892cd 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -1772,7 +1772,6 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
 	u16 error = 0;
 	u16 dsp_index = 0;
 	u16 num_dsp = ((struct hpi_hw_obj *)pao->priv)->num_dsp;
-	hpios_dsplock_lock(pao);
 
 	if (num_dsp < 2)
 		dsp_index = 0;
@@ -1793,6 +1792,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
 			}
 		}
 	}
+
+	hpios_dsplock_lock(pao);
 	error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr);
 
 	/* maybe an error response */