hal: Branch 'master'

[Richard Hughes]

 hald/linux/device.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4870805ec7667efe8f64d9fd87703cef99931fd7
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 8 20:57:44 2008 +0100

    fix a crash when the rfkill device does not have a type
    
    Backtrace is at https://bugzilla.redhat.com/show_bug.cgi?id=466150

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 89d0cdd..26f6c1b 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -3534,6 +3534,8 @@ rfkill_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent
 	}
 
 	type = hal_util_get_string_from_file (sysfs_path, "type");
+	if (type == NULL)
+		type = "unknown";
 
 	if (strcasecmp (type, "wimax") == 0) {
 		hal_device_property_set_string (d, "killswitch.type", "wwan");