Attachment #284875 for bug #380943

Lines 205-211 def get_pci_short_long_names(pci_class, pci_subclass, pci_protocol): Link Here

(-)a/udevdiscover/device/pci.py (-1 / +4 lines)
205	else:	205	else:
206	key.append(pci_protocol)	206	key.append(pci_protocol)
207		207
208	return pci_class_names[tuple(key)]	208	if pci_class_names.has_key(tuple(key)):
		209	return pci_class_names[tuple(key)]
		210	else:
		211	return pci_class_names[(pci_class, -1, -1)]
209		212
210	@memoized	213	@memoized
211	def get_pci_vendor_model_names(sysfs_path):	214	def get_pci_vendor_model_names(sysfs_path):

Lines 162-168 def get_usb_short_long_names(usb_class, usb_subclass, usb_protocol): Link Here

(-)a/udevdiscover/device/usb.py (-3 / +5 lines)
162	return None, None	162	return None, None
163		163
164	subklasses = [s for s in klasses if s[1] == usb_subclass]	164	subklasses = [s for s in klasses if s[1] == usb_subclass]
165		165
166	if not subklasses:	166	if not subklasses:
167	key.append(-1)	167	key.append(-1)
168	else:	168	else:
Lines 173-179 def get_usb_short_long_names(usb_class, usb_subclass, usb_protocol): Link Here
173	else:	173	else:
174	key.append(usb_protocol)	174	key.append(usb_protocol)
175		175
176	return usb_class_names[tuple(key)]	176	if usb_class_names.has_key(tuple(key)):
		177	return usb_class_names[tuple(key)]
		178	else:
		179	return usb_class_names[(usb_class, -1, -1)]
177		180
178	@memoized	181	@memoized
179	def get_usb_vendor_model_names(sysfs_path):	182	def get_usb_vendor_model_names(sysfs_path):
180	-

Return to bug 380943