From: Bjørn Mork Date: Sat, 11 Jan 2014 01:04:00 +0000 (+0100) Subject: usb: core: let dynamic ids override static ids X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=31c6bf70955dda6ef92ab40624f289576cff97d3;p=openwrt%2Fstaging%2Fblogic.git usb: core: let dynamic ids override static ids This modifies the probing order so that any matching dynamic entry always will be used, even if the driver has a matching static entry. It is sometimes useful to dynamically update existing device entries. With the new ability to set the dynamic entry driver_info field, this can be used to test new additions to class driver exception lists or proposed changes to existing static per-device driver_info entries. Signed-off-by: Bjørn Mork Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 5d01558cef66..9cd218135087 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -302,9 +302,9 @@ static int usb_probe_interface(struct device *dev) return error; } - id = usb_match_id(intf, driver->id_table); + id = usb_match_dynamic_id(intf, driver); if (!id) - id = usb_match_dynamic_id(intf, driver); + id = usb_match_id(intf, driver->id_table); if (!id) return error;