1 files changed, 16 insertions, 18 deletions

diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index d8e7047512f..a32502e796d 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -107,7 +107,6 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         union hpi_response_buffer_v1 *hr;
         u16 res_max_size;
         u32 uncopied_bytes;
-        struct hpi_adapter *pa = NULL;
         int err = 0;
 
         if (cmd != HPI_IOCTL_LINUX)
@@ -157,11 +156,6 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 goto out;
         }
 
-        if (hm->h.adapter_index >= HPI_MAX_ADAPTERS) {
-                err = -EINVAL;
-                goto out;
-        }
-
         switch (hm->h.function) {
         case HPI_SUBSYS_CREATE_ADAPTER:
         case HPI_ADAPTER_DELETE:
@@ -183,16 +177,21 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         } else {
                 u16 __user *ptr = NULL;
                 u32 size = 0;
-
+                u32 adapter_present;
                 /* -1=no data 0=read from user mem, 1=write to user mem */
                 int wrflag = -1;
-                u32 adapter = hm->h.adapter_index;
-                pa = &adapters[adapter];
+                struct hpi_adapter *pa;
+
+                if (hm->h.adapter_index < HPI_MAX_ADAPTERS) {
+                        pa = &adapters[hm->h.adapter_index];
+                        adapter_present = pa->type;
+                } else {
+                        adapter_present = 0;
+                }
 
-                if ((adapter > HPI_MAX_ADAPTERS) || (!pa->type)) {
-                        hpi_init_response(&hr->r0, HPI_OBJ_ADAPTER,
-                                HPI_ADAPTER_OPEN,
-                                HPI_ERROR_BAD_ADAPTER_NUMBER);
+                if (!adapter_present) {
+                        hpi_init_response(&hr->r0, hm->h.object,
+                                hm->h.function, HPI_ERROR_BAD_ADAPTER_NUMBER);
 
                         uncopied_bytes =
                                 copy_to_user(puhr, hr, sizeof(hr->h));
@@ -203,7 +202,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         goto out;
                 }
 
-                if (mutex_lock_interruptible(&adapters[adapter].mutex)) {
+                if (mutex_lock_interruptible(&pa->mutex)) {
                         err = -EINTR;
                         goto out;
                 }
@@ -239,8 +238,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                                         "stream buffer size %d\n",
                                                         size);
 
-                                                mutex_unlock(&adapters
-                                                        [adapter].mutex);
+                                                mutex_unlock(&pa->mutex);
                                                 err = -EINVAL;
                                                 goto out;
                                         }
@@ -281,7 +279,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                         uncopied_bytes, size);
                 }
 
-                mutex_unlock(&adapters[adapter].mutex);
+                mutex_unlock(&pa->mutex);
         }
 
         /* on return response size must be set */