rpms/kernel/devel linux-2.6-uevent-ebus.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1535

Modified Files:
	linux-2.6-uevent-ebus.patch 
Log Message:
fix ebus properly. Doh.

linux-2.6-uevent-ebus.patch:
 ibmebus.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

Index: linux-2.6-uevent-ebus.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-uevent-ebus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-uevent-ebus.patch	19 Dec 2006 17:31:28 -0000	1.2
+++ linux-2.6-uevent-ebus.patch	19 Dec 2006 17:49:36 -0000	1.3
@@ -73,7 +73,7 @@
 index 82bd2f1..5a42100 100644
 --- a/arch/powerpc/kernel/ibmebus.c
 +++ b/arch/powerpc/kernel/ibmebus.c
-@@ -361,10 +361,28 @@ static int ibmebus_bus_match(struct devi
+@@ -361,9 +361,31 @@ static int ibmebus_bus_match(struct devi
  	return 0;
  }
  
@@ -83,14 +83,17 @@
 +	struct ibmebus_dev *ebus_dev;
 +	struct of_device *of;
 +
-+	/* Don't generate uevents for the fake parent device */
-+	if (!dev || dev == &ibmebus_bus_device.ofdev.dev)
++	if (!dev)
 +		return -ENODEV;
 +
 +	ebus_dev = to_ibmebus_dev(dev);
 +	if (!ebus_dev)
 +		return -ENODEV;
 +
++	/* Don't generate uevents for the fake parent device */
++	if (ebus_dev == &ibmebus_bus_device)
++		return -ENODEV;
++
 +	of = &ebus_dev->ofdev;
 +	return of_device_uevent(of, envp, num_envp, buffer, buffer_size);
 +}