Skip to contentSkip to conversation

PATCH: ns558 bugfix / CSC ids

PATCH Marcus Meissner 1 participant 1 message Jun 1, 2001

lore
Share & tools
lore

Marcus Meissner

author
#0 lore raw

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

char/joystick/ns558.c +3 -0
diff -u -r1.16 ns558.c
@@ -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);