hal/hald/linux osspec.c,1.52.2.2,1.52.2.3

[David Zeuthen]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	osspec.c 
Log Message:
2005-01-06  David Zeuthen  <davidz at redhat.com>

	* hald/linux/osspec.c (add_device): Patch from Sjoerd Simons
	<sjoerd at luon.net>. Hal doesn't handle the case that
	recover_net_device fails, causing a nice segv. Fixed in attached
	patch.



Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
retrieving revision 1.52.2.2
retrieving revision 1.52.2.3
diff -u -d -r1.52.2.2 -r1.52.2.3
--- osspec.c	1 Dec 2004 04:28:58 -0000	1.52.2.2
+++ osspec.c	7 Jan 2005 03:22:34 -0000	1.52.2.3
@@ -1037,8 +1037,10 @@
 						} else {
 							HAL_INFO (("%s worked!", sysfs_path));
 						}
+					} else {
+						HAL_INFO (("Recovery failed!"));
+						return NULL;
 					}
-
 				} else {
 					HAL_WARNING (("Coulnd't get sysfs class device object at path %s", sysfs_path));
 					return NULL;