From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sun, 19 Jun 2005 23:01:26 +0000
Subject: remove detach_state from udev's wait_for_sysfs
Message-Id: <20050619230126.GA7496@vrfy.org>
List-Id: <linux-hotplug.vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: linux-hotplug@vger.kernel.org

Change udev's built-in wait-for-sysfs to wait for the "power"
directory instead of the "detached_state" file which no longer
exists with kernel 2.6.12. Without that patch udev will delay
events for some subsystems by 5 seconds.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---

diff --git a/udev_sysfs.c b/udev_sysfs.c
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -297,38 +297,38 @@ int wait_for_devices_device(struct sysfs
 		{ .bus = "usb",		.file = "idVendor" },
 		{ .bus = "usb",		.file = "iInterface" },
 		{ .bus = "usb",		.file = "bNumEndpoints" },
-		{ .bus = "usb-serial",	.file = "detach_state" },
-		{ .bus = "ide",		.file = "detach_state" },
+		{ .bus = "usb-serial",	.file = "power" },
+		{ .bus = "ide",		.file = "power" },
 		{ .bus = "pci",		.file = "vendor" },
-		{ .bus = "platform",	.file = "detach_state" },
-		{ .bus = "pcmcia",	.file = "detach_state" },
-		{ .bus = "i2c",		.file = "detach_state" },
+		{ .bus = "platform",	.file = "power" },
+		{ .bus = "pcmcia",	.file = "power" },
+		{ .bus = "i2c",		.file = "power" },
 		{ .bus = "ieee1394",	.file = "node_count" },
 		{ .bus = "ieee1394",	.file = "nodeid" },
 		{ .bus = "ieee1394",	.file = "address" },
 		{ .bus = "bttv-sub",	.file = NULL },
-		{ .bus = "pnp",		.file = "detach_state" },
-		{ .bus = "eisa",	.file = "detach_state" },
-		{ .bus = "serio",	.file = "detach_state" },
-		{ .bus = "pseudo",	.file = "detach_state" },
-		{ .bus = "mmc",		.file = "detach_state" },
-		{ .bus = "macio",	.file = "detach_state" },
-		{ .bus = "of_platform",	.file = "detach_state" },
-		{ .bus = "vio",		.file = "detach_state" },
-		{ .bus = "ecard",	.file = "detach_state" },
-		{ .bus = "sa1111-rab",	.file = "detach_state" },
-		{ .bus = "amba",	.file = "detach_state" },
-		{ .bus = "locomo-bus",	.file = "detach_state" },
-		{ .bus = "logicmodule",	.file = "detach_state" },
-		{ .bus = "parisc",	.file = "detach_state" },
-		{ .bus = "ocp",		.file = "detach_state" },
-		{ .bus = "dio",		.file = "detach_state" },
-		{ .bus = "MCA",		.file = "detach_state" },
-		{ .bus = "wl",		.file = "detach_state" },
-		{ .bus = "ccwgroup",	.file = "detach_state" },
-		{ .bus = "css",		.file = "detach_state" },
-		{ .bus = "ccw",		.file = "detach_state" },
-		{ .bus = "iucv",	.file = "detach_state" },
+		{ .bus = "pnp",		.file = "power" },
+		{ .bus = "eisa",	.file = "power" },
+		{ .bus = "serio",	.file = "power" },
+		{ .bus = "pseudo",	.file = "power" },
+		{ .bus = "mmc",		.file = "power" },
+		{ .bus = "macio",	.file = "power" },
+		{ .bus = "of_platform",	.file = "power" },
+		{ .bus = "vio",		.file = "power" },
+		{ .bus = "ecard",	.file = "power" },
+		{ .bus = "sa1111-rab",	.file = "power" },
+		{ .bus = "amba",	.file = "power" },
+		{ .bus = "locomo-bus",	.file = "power" },
+		{ .bus = "logicmodule",	.file = "power" },
+		{ .bus = "parisc",	.file = "power" },
+		{ .bus = "ocp",		.file = "power" },
+		{ .bus = "dio",		.file = "power" },
+		{ .bus = "MCA",		.file = "power" },
+		{ .bus = "wl",		.file = "power" },
+		{ .bus = "ccwgroup",	.file = "power" },
+		{ .bus = "css",		.file = "power" },
+		{ .bus = "ccw",		.file = "power" },
+		{ .bus = "iucv",	.file = "power" },
 		{ NULL, NULL }
 	};
 	const struct device_file *devicefile = NULL;



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_idt77&alloc_id492&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel