[patch] aha152x.c

[Juergen E Fischer]

Hi there,

here some minor fixes for the aha152x driver.

Juergen


--- aha152x.c-2.4.0-test5       Tue Aug  8 21:45:31 2000
+++ aha152x.c   Tue Aug  8 21:56:52 2000
@@ -13,9 +13,12 @@
  * General Public License for more details.
  *
  *
- * $Id: aha152x.c,v 2.1 2000/05/17 16:23:17 fischer Exp fischer $
+ * $Id: aha152x.c,v 2.2 2000/08/08 19:54:53 fischer Exp fischer $
  *
  * $Log: aha152x.c,v $
+ * Revision 2.2  2000/08/08 19:54:53  fischer
+ * - minor changes
+ *
  * Revision 2.1  2000/05/17 16:23:17  fischer
  * - signature update
  * - fix for data out w/o scatter gather
@@ -293,7 +296,6 @@
                        (cmd) ? ((cmd)->lun & 0x07) : -1
 
 #define DELAY_DEFAULT 100
-#define DEBUG_DEFAULT 0
 
 /* possible irq range */
 #if defined(PCMCIA)
@@ -357,11 +359,11 @@
 #if !defined(AHA152X_DEBUG)
 MODULE_PARM(aha152x, "1-8i");
 MODULE_PARM_DESC(aha152x, "parameters for first controller");
-static int aha152x[]   = {0, 11, 7, 1, 1, 1, DELAY_DEFAULT, 0, DEBUG_DEFAULT};
+static int aha152x[] = {0, 11, 7, 1, 1, 0, DELAY_DEFAULT, 0};
 
 MODULE_PARM(aha152x1, "1-8i");
 MODULE_PARM_DESC(aha152x1, "parameters for second controller");
-static int aha152x1[]  = {0, 11, 7, 1, 1, 1, DELAY_DEFAULT, 0, DEBUG_DEFAULT};
+static int aha152x1[] = {0, 11, 7, 1, 1, 0, DELAY_DEFAULT, 0};
 #else
 MODULE_PARM(debug, "1-2i");
 MODULE_PARM_DESC(debug, "flags for driver debugging");
@@ -369,11 +371,11 @@
 
 MODULE_PARM(aha152x, "1-9i");
 MODULE_PARM_DESC(aha152x, "parameters for first controller");
-static int aha152x[] = {0, 11, 7, 1, 1, 0, DELAY_DEFAULT, 0};
+static int aha152x[]   = {0, 11, 7, 1, 1, 1, DELAY_DEFAULT, 0, DEBUG_DEFAULT};
 
 MODULE_PARM(aha152x1, "1-9i");
 MODULE_PARM_DESC(aha152x1, "parameters for second controller");
-static int aha152x1[] = {0, 11, 7, 1, 1, 0, DELAY_DEFAULT, 0};
+static int aha152x1[]  = {0, 11, 7, 1, 1, 1, DELAY_DEFAULT, 0, DEBUG_DEFAULT};
 #endif /* !defined(AHA152X_DEBUG) */
 #endif /* MODULE */
 
@@ -954,7 +956,7 @@
        if (setup_count < 2) {
                struct aha152x_setup override = SETUP0;
 
-               if (setup_count == 0 || (override.io_port != setup[0].io_port))
+               if (setup_count == 0 || (override.io_port != setup[0].io_port)) {
                        if (!checksetup(&override)) {
                                printk(KERN_ERR "\naha152x: invalid override 
SETUP0={0x%x,%d,%d,%d,%d,%d,%d,%d}\n",
                                       override.io_port,
@@ -967,6 +969,7 @@
                                       override.ext_trans);
                        } else
                                setup[setup_count++] = override;
+               }
        }
 #endif
 
@@ -974,7 +977,7 @@
        if (setup_count < 2) {
                struct aha152x_setup override = SETUP1;
 
-               if (setup_count == 0 || (override.io_port != setup[0].io_port))
+               if (setup_count == 0 || (override.io_port != setup[0].io_port)) {
                        if (!checksetup(&override)) {
                                printk(KERN_ERR "\naha152x: invalid override 
SETUP1={0x%x,%d,%d,%d,%d,%d,%d,%d}\n",
                                       override.io_port,
@@ -987,6 +990,7 @@
                                       override.ext_trans);
                        } else
                                setup[setup_count++] = override;
+               }
        }
 #endif
 

-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]