|
Lines 1098-1107
Link Here
|
| 1098 |
libhal_free_string (usb_intf_udi); |
1098 |
libhal_free_string (usb_intf_udi); |
| 1099 |
} |
1099 |
} |
| 1100 |
} |
1100 |
} |
|
|
1101 |
if (subsys && !strcmp (subsys, "ssb")) { |
| 1102 |
char *ssb_intf_udi; |
| 1103 |
|
| 1104 |
ssb_intf_udi = libhal_device_get_property_string (priv->hal_ctx, udi, "info.parent", NULL); |
| 1105 |
if (ssb_intf_udi) { |
| 1106 |
od = libhal_device_get_property_string (priv->hal_ctx, ssb_intf_udi, "info.parent", NULL); |
| 1107 |
|
| 1108 |
/* Ensure the grandparent really is the "USB Device" */ |
| 1109 |
if (od) { |
| 1110 |
tmp = hal_get_subsystem (priv->hal_ctx, od); |
| 1111 |
if (!tmp || !strcmp (tmp, "ssb")) { |
| 1112 |
od = NULL; |
| 1113 |
} |
| 1114 |
if (tmp) |
| 1115 |
libhal_free_string (tmp); |
| 1116 |
} |
| 1117 |
libhal_free_string (ssb_intf_udi); |
| 1118 |
} |
| 1119 |
} |
| 1101 |
libhal_free_string (subsys); |
1120 |
libhal_free_string (subsys); |
| 1102 |
libhal_free_string (parent); |
1121 |
libhal_free_string (parent); |
| 1103 |
|
1122 |
|
| 1104 |
/* For non-USB devices, and ss a fallback, just use the originating device |
1123 |
/* For non-USB,SSB devices, and ss a fallback, just use the originating device |
| 1105 |
* of the tty; though this might result in more than one modem being detected by NM. |
1124 |
* of the tty; though this might result in more than one modem being detected by NM. |
| 1106 |
*/ |
1125 |
*/ |
| 1107 |
if (!od) |
1126 |
if (!od) |
