diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2014-01-20 13:56:24 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2014-01-20 13:56:24 +0000 |
commit | 11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c (patch) | |
tree | ec4fe2ab7f765c6d86d6b321349f296dbc9afb9b /target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch | |
parent | 54d11602cc5a312834e38e09158ac55cc3429a86 (diff) | |
download | master-187ad058-11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c.tar.gz master-187ad058-11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c.tar.bz2 master-187ad058-11d25cc460a75454a9aa8d3a7c70abb5abcf8d2c.zip |
[generic]: add initial 3.13 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch')
-rw-r--r-- | target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch new file mode 100644 index 0000000000..99c7a3620c --- /dev/null +++ b/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch @@ -0,0 +1,84 @@ +--- a/drivers/usb/core/usb.c ++++ b/drivers/usb/core/usb.c +@@ -689,6 +689,71 @@ int __usb_get_extra_descriptor(char *buf + } + EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor); + ++static struct usb_device *match_device_name(struct usb_device *dev, ++ const char *name) ++{ ++ struct usb_device *ret_dev = NULL; ++ struct usb_device *childdev = NULL; ++ int child; ++ ++ dev_dbg(&dev->dev, "check for name %s ...\n", name); ++ ++ /* see if this device matches */ ++ if (strcmp(dev_name(&dev->dev), name) == 0 ) { ++ dev_dbg(&dev->dev, "matched this device!\n"); ++ ret_dev = usb_get_dev(dev); ++ goto exit; ++ } ++ /* look through all of the children of this device */ ++ usb_hub_for_each_child(dev, child, childdev) { ++ if (childdev) { ++ usb_lock_device(childdev); ++ ret_dev = match_device_name(childdev, name); ++ usb_unlock_device(childdev); ++ if (ret_dev) ++ goto exit; ++ } ++ } ++exit: ++ return ret_dev; ++} ++ ++/** ++ * usb_find_device_by_name - find a specific usb device in the system ++ * @name: the name of the device to find ++ * ++ * Returns a pointer to a struct usb_device if such a specified usb ++ * device is present in the system currently. The usage count of the ++ * device will be incremented if a device is found. Make sure to call ++ * usb_put_dev() when the caller is finished with the device. ++ * ++ * If a device with the specified bus id is not found, NULL is returned. ++ */ ++struct usb_device *usb_find_device_by_name(const char *name) ++{ ++ struct list_head *buslist; ++ struct usb_bus *bus; ++ struct usb_device *dev = NULL; ++ ++ mutex_lock(&usb_bus_list_lock); ++ for (buslist = usb_bus_list.next; ++ buslist != &usb_bus_list; ++ buslist = buslist->next) { ++ bus = container_of(buslist, struct usb_bus, bus_list); ++ if (!bus->root_hub) ++ continue; ++ usb_lock_device(bus->root_hub); ++ dev = match_device_name(bus->root_hub, name); ++ usb_unlock_device(bus->root_hub); ++ if (dev) ++ goto exit; ++ } ++exit: ++ mutex_unlock(&usb_bus_list_lock); ++ return dev; ++} ++EXPORT_SYMBOL_GPL(usb_find_device_by_name); ++ + /** + * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP + * @dev: device the buffer will be used with +--- a/include/linux/usb.h ++++ b/include/linux/usb.h +@@ -692,6 +692,7 @@ static inline bool usb_device_no_sg_cons + return udev && udev->bus && udev->bus->no_sg_constraint; + } + ++extern struct usb_device *usb_find_device_by_name(const char *name); + + /*-------------------------------------------------------------------------*/ + |