Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ALSA: asihpi - bug fix pa use before init.

Browse source 
Fixes bug introduced by 1c073b67.
Also declare pa local to block in which it is used.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eliot Blennerhassett 2011-07-27 20:03:51 +12:00 committed by Takashi Iwai
parent 45eebda7b4
commit 767cd365b2
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sound/pci/asihpi/hpioctl.c
View file

@ -107,7 +107,6 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
union hpi_response_buffer_v1 *hr; union hpi_response_buffer_v1 *hr;
u16 res_max_size; u16 res_max_size;
u32 uncopied_bytes; u32 uncopied_bytes;
struct hpi_adapter *pa = NULL;
int err = 0; int err = 0;
if (cmd != HPI_IOCTL_LINUX) if (cmd != HPI_IOCTL_LINUX)
@ -182,6 +181,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
/* -1=no data 0=read from user mem, 1=write to user mem */ /* -1=no data 0=read from user mem, 1=write to user mem */
int wrflag = -1; int wrflag = -1;
u32 adapter = hm->h.adapter_index; u32 adapter = hm->h.adapter_index;
struct hpi_adapter *pa = &adapters[adapter];
if ((adapter > HPI_MAX_ADAPTERS) || (!pa->type)) { if ((adapter > HPI_MAX_ADAPTERS) || (!pa->type)) {
hpi_init_response(&hr->r0, HPI_OBJ_ADAPTER, hpi_init_response(&hr->r0, HPI_OBJ_ADAPTER,
@ -197,9 +197,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
goto out; goto out;
} }
pa = &adapters[adapter]; if (mutex_lock_interruptible(&pa->mutex)) {
if (mutex_lock_interruptible(&adapters[adapter].mutex)) {
err = -EINTR; err = -EINTR;
goto out; goto out;
} }
@ -235,8 +233,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
"stream buffer size %d\n", "stream buffer size %d\n",
size); size);
mutex_unlock(&adapters mutex_unlock(&pa->mutex);
[adapter].mutex);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
@ -277,7 +274,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
uncopied_bytes, size); uncopied_bytes, size);
} }
mutex_unlock(&adapters[adapter].mutex); mutex_unlock(&pa->mutex);
} }
/* on return response size must be set */ /* on return response size must be set */