hal/hald/linux2/probing probe-storage.c,1.5,1.6

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2/probing
In directory gabe:/tmp/cvs-serv25722/hald/linux2/probing

Modified Files:
	probe-storage.c 
Log Message:
2005-04-04  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/addons/Makefile.am (libexec_PROGRAMS): Only build
	hald-addon-usb-csr if we have libusb

	* configure.in: Check for libusb (since it appear not to build
	on s390/s390x if we don't have it)

2005-04-04  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/probing/probe-storage.c (main): storage.serial and
	storage.firmware_revision may return bogus data so don't quit
	if we fail when setting it (Red Hat bug #151762)



Index: probe-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-storage.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- probe-storage.c	22 Mar 2005 18:43:18 -0000	1.5
+++ probe-storage.c	5 Apr 2005 16:31:31 -0000	1.6
@@ -172,19 +172,24 @@
 			did = drive_id_open_fd (fd);
 			if (drive_id_probe_all (did) == 0) {
 				dbg ("serial = '%s', firmware = '%s'", did->serial, did->firmware);
-				if (did->serial[0] != '\0')
+				if (did->serial[0] != '\0') {
+					dbus_error_init (&error);
 					if (!libhal_device_set_property_string (ctx, udi, "storage.serial", 
 										did->serial, &error)) {
-						close (fd);
-						goto out;
+						dbg ("Error setting storage.serial");
 					}
+				}
 				
-				if (did->firmware[0] != '\0')
+				if (did->firmware[0] != '\0') {
+					dbus_error_init (&error);
 					if (!libhal_device_set_property_string (ctx, udi, "storage.firmware_version", 
 										did->firmware, &error)) {
-						close (fd);
-						goto out;
+						dbg ("Error setting storage.firmware_version");
 					}
+				}
+
+				dbus_error_init (&error);
+
 			}
 			drive_id_close (did);