[CVS] km km.c,1.104,1.105

[<gat...@li...>]

Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30285

Modified Files:
	km.c 
Log Message:
Initialize DEVICE_ID correctly when kernel is compiled without
CONFIG_PCI_NAMES. Failure to initialize it caused for example avview
to crash at launch.


Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- km.c	12 Mar 2005 13:55:00 -0000	1.104
+++ km.c	16 Mar 2005 07:27:35 -0000	1.105
@@ -725,7 +725,8 @@
 	FIELD("DEVICE_ID").data.c.string=kmalloc(strlen(dev->pretty_name)+1, GFP_KERNEL);
 	memcpy(FIELD("DEVICE_ID").data.c.string, dev->pretty_name, strlen(dev->pretty_name)+1);
 #else
-	FIELD("DEVICE_ID").data.c.string=0;
+	FIELD("DEVICE_ID").data.c.string=kmalloc(strlen(dev->slot_name)+1, GFP_KERNEL);
+	memcpy(FIELD("DEVICE_ID").data.c.string, dev->slot_name, strlen(dev->slot_name)+1);
 #endif
 #else
 	FIELD("DEVICE_ID").data.c.string=kmalloc(strlen(dev->name)+1, GFP_KERNEL);