PATCH: ns558 bugfix / CSC ids

From: Marcus Meissner (Marcus.Meissner@caldera.de)
Date: Fri Jun 01 2001 - 10:42:32 EST


Hi,

I have added two CSC function ids to the ISAPNP joystick probing.
CSC cards use a lot of varying ids for the functions, but in my
set of data, 0010 and 0110 are always 'CTL'Game Controllers.

One bugfix: port->size must be set, or the release_region on rmmod ns558
fails badly.

Tested on IBM Netfinity 3500.

Ciao, Marcus

Index: drivers/char/joystick/ns558.c
===================================================================
RCS file: /build/mm/work/repository/linux-mm/drivers/char/joystick/ns558.c,v
retrieving revision 1.16
diff -u -r1.16 ns558.c
--- drivers/char/joystick/ns558.c 2001/06/01 11:33:11 1.16
+++ drivers/char/joystick/ns558.c 2001/06/01 15:31:09
@@ -178,6 +178,8 @@
         { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x7001), 0 },
         { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x7002), 0 },
         { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('C','S','C'), ISAPNP_DEVICE(0x0b35), 0 },
+ { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('C','S','C'), ISAPNP_DEVICE(0x0010), 0 },
+ { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('C','S','C'), ISAPNP_DEVICE(0x0110), 0 },
         { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('P','N','P'), ISAPNP_DEVICE(0xb02f), 0 },
         { 0, },
 };
@@ -217,6 +219,7 @@
         port->next = next;
         port->type = NS558_PNP;
         port->gameport.io = ioport;
+ port->size = iolen;
         port->dev = dev;
 
         gameport_register_port(&port->gameport);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jun 07 2001 - 21:00:15 EST