summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@web.de>2009-07-18 10:37:53 +0200
committerDanny Kukawka <danny.kukawka@web.de>2010-04-16 14:59:13 +0200
commite9905ebea9f190c71c994642e1fcd05a63601d79 (patch)
tree9497727f8945f39a33a134259b2ceff15153b817
parent44954a83e2b600f49a58d3299375c722e87e998a (diff)
cleanup: don't set udi manually if hal_device_set_udi() was used
Cleaned up: Don't call hal_device_property_set_string (d, "info.udi", udi); if hal_device_set_udi (d, udi); was called before. hal_device_set_udi() already set info.udi for the device.
-rw-r--r--hald/linux/device.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 2f5829eb..d8c543df 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -793,7 +793,6 @@ ibmebus_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/ibmebus%s",
hal_device_property_get_string (d, "ibmebus.devspec"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1413,7 +1412,6 @@ memstick_compute_udi (HalDevice *d)
"%s_memstick_card",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1460,7 +1458,6 @@ memstick_host_compute_udi (HalDevice *d)
"%s_memstick_host",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3606,7 +3603,6 @@ ssb_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/ssb_%s",
hal_device_property_get_string (d, "ssb.bus_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}