[PATCH TRIVIAL] joysticks/gamecon: Fix GPF and GC_DDR bug

[Peter Nelson]

Linus recently accepted my patch that has been in Vojtech's tree for a 
while but I have just been able to get my development machine working 
again and found two bugs.  The first causes a General Protection Fault 
because of a missing ',' when initializing the gc_names array (took 
forever to track down).  The second causes no data to be processed when 
the type is set to GC_DDR.  Some of the PSX functions check the status 
bits against only GC_PSX instead of both (since DDR is a subset of PSX).

-Peter Nelson

---

===== drivers/input/joystick/gamecon.c 1.18 vs edited =====
--- 1.18/drivers/input/joystick/gamecon.c       2004-06-24 11:55:22 -04:00
+++ edited/drivers/input/joystick/gamecon.c     2004-09-20 13:58:40 -04:00
@@ -89,7 +89,7 @@ static struct gc *gc_base[3];
static int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 };

static char *gc_names[] = { NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
-                               "Multisystem 2-button joystick", "N64 controller", "PSX controller"
+                               "Multisystem 2-button joystick", "N64 controller", "PSX controller",
                               "PSX DDR controller" };
/*
 * N64 support.
@@ -271,7 +271,8 @@ static void gc_psx_command(struct gc *gc
               udelay(gc_psx_delay);
               read = parport_read_status(gc->pd->port) ^ 0x80;
               for (j = 0; j < 5; j++)
-                       data[j] |= (read & gc_status_bit[j] & gc->pads[GC_PSX]) ? (1 << i) : 0;
+                       data[j] |= (read & gc_status_bit[j] & (gc->pads[GC_PSX] | gc->pads[GC_DDR]))
+                               ? (1 << i) : 0;
               parport_write_data(gc->pd->port, cmd | GC_PSX_CLOCK | GC_PSX_POWER);
               udelay(gc_psx_delay);
       }
@@ -300,7 +301,8 @@ static void gc_psx_read_packet(struct gc
       gc_psx_command(gc, 0, data2);                                                   /* Dump status */

       for (i =0; i < 5; i++)                                                          /* Find the longest pad */
-               if((gc_status_bit[i] & gc->pads[GC_PSX]) && (GC_PSX_LEN(id[i]) > max_len))
+               if((gc_status_bit[i] & (gc->pads[GC_PSX] | gc->pads[GC_DDR]))
+                  && (GC_PSX_LEN(id[i]) > max_len))
                       max_len = GC_PSX_LEN(id[i]);

       for (i = 0; i < max_len * 2; i++) {                                             /* Read in all the data */


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/