hal/hald/linux2 blockdev.c,1.33,1.34

[David Zeuthen]

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

Modified Files:
	blockdev.c 
Log Message:
2006-02-09  David Zeuthen  <davidz at redhat.com>

        * hald/linux2/blockdev.c
        (blockdev_callouts_preprobing_storage_done): Fix lockup for ATAPI
        Zip drives as we pass end_token to the function
        add_blockdev_probing_helper_done() in the wrong position.



Index: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- blockdev.c	23 Jan 2006 12:15:50 -0000	1.33
+++ blockdev.c	9 Feb 2006 17:41:22 -0000	1.34
@@ -379,10 +379,12 @@
 			                    (gpointer) end_token, NULL);
 			goto out;
 		} else {
+			char *synerror[1] = {NULL};
+
 			HAL_INFO (("Not probing storage device %s", 
 				   hal_device_property_get_string (d, "block.device")));
 
-			add_blockdev_probing_helper_done (d, FALSE, 0, (gpointer) end_token, NULL, NULL);
+			add_blockdev_probing_helper_done (d, FALSE, 0, synerror, (gpointer) end_token, NULL);
 			goto out;
 		}
 	}