hal/hald/linux block_class_device.c,1.75,1.76

[Kay Sievers]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv20478/hald/linux

Modified Files:
	block_class_device.c 
Log Message:
2004-09-21  Kay Sievers  <kay.sievers at vrfy.org>

        * hald/linux/block_class_device.c: (block_class_accept):
        skip legacy floppies here, until we get proper sysfs links to the
        platform device and switch over to merge floppies into that device.
        Legacy floppies handled until that in platform_bus_device.c

        I'm working on fixing the kernel sysfs /device-links and with such
        a link hald probes legacy floppies with block_class_device.c which
        we don't want right now cause it can block the whole process.



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- block_class_device.c	21 Sep 2004 06:39:00 -0000	1.75
+++ block_class_device.c	21 Sep 2004 20:16:42 -0000	1.76
@@ -160,10 +160,17 @@
 		    const char *path,
 		    struct sysfs_class_device *class_device)
 {
+	int instance;
 
 	/*HAL_INFO (("path = %s, classname = %s", 
 	  path, self->sysfs_class_name));*/
 
+	/* skip legacy floppies for now, until we get proper sysfs links to the
+	   platform device and switch over to merge floppies into that device.
+	   Legacy floppies handled until that in platform_bus_device.c */
+	if (sscanf (class_device->name, "fd%d", &instance) == 1)
+		return FALSE;
+
 	/* only care about given sysfs class name */
 	if (strcmp (class_device->classname, self->sysfs_class_name) == 0) {
 		return TRUE;