aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2010-05-27 01:53:53 -0400
committerTakashi Iwai <tiwai@suse.de>2010-05-27 03:53:00 -0400
commitbca516bfcfeb545e00bad3b6ca075d91c9c0b365 (patch)
treefd450db9651ca2a4712813b1289ed6f4d76f2d5d
parent70ebe64721ff685129a4016162d6370e4c10ba69 (diff)
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>
-rw-r--r--sound/pci/asihpi/hpi6000.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 26b3b3f0a152..12dab5e4892c 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,
1772 u16 error = 0; 1772 u16 error = 0;
1773 u16 dsp_index = 0; 1773 u16 dsp_index = 0;
1774 u16 num_dsp = ((struct hpi_hw_obj *)pao->priv)->num_dsp; 1774 u16 num_dsp = ((struct hpi_hw_obj *)pao->priv)->num_dsp;
1775 hpios_dsplock_lock(pao);
1776 1775
1777 if (num_dsp < 2) 1776 if (num_dsp < 2)
1778 dsp_index = 0; 1777 dsp_index = 0;
@@ -1793,6 +1792,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
1793 } 1792 }
1794 } 1793 }
1795 } 1794 }
1795
1796 hpios_dsplock_lock(pao);
1796 error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr); 1797 error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr);
1797 1798
1798 /* maybe an error response */ 1799 /* maybe an error response */