summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorMichael Brown2015-02-12 01:46:22 +0100
committerMichael Brown2015-02-12 01:57:15 +0100
commit6fe8f80418c71b4d05b7de362db9f142690d1a57 (patch)
treeb5ca7b9246439cf44c0ff27fb55317008b6e5c67 /src/include
parent[rndis] Add rndis_rx_err() (diff)
downloadipxe-6fe8f80418c71b4d05b7de362db9f142690d1a57.tar.gz
ipxe-6fe8f80418c71b4d05b7de362db9f142690d1a57.tar.xz
ipxe-6fe8f80418c71b4d05b7de362db9f142690d1a57.zip
[usb] Handle port status changes received after failing to find a driver
Commit a60f2dd ("[usb] Try multiple USB device configurations") changed the behaviour of register_usb() such that if no drivers are found then the device will be closed and the memory used will be freed. If a port status change subsequently occurs while the device is still physically attached, then usb_hotplug() will see this as a new device having been attached, since there is no device recorded as being currently attached to the port. This can lead to spurious hotplug events (or even endless loops of hotplug events, if the process of opening and closing the device happens to generate a port status change). Fix by using a separate flag to indicate that a device is physically attached (even if we have no corresponding struct usb_device). Reported-by: Dan Ellis <Dan.Ellis@displaylink.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ipxe/usb.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/include/ipxe/usb.h b/src/include/ipxe/usb.h
index 1f5a85ec..8e182416 100644
--- a/src/include/ipxe/usb.h
+++ b/src/include/ipxe/usb.h
@@ -702,7 +702,13 @@ struct usb_port {
unsigned int protocol;
/** Port speed */
unsigned int speed;
- /** Currently attached device (if any) */
+ /** Port has an attached device */
+ int attached;
+ /** Currently attached device (if in use)
+ *
+ * Note that this field will be NULL if the attached device
+ * has been freed (e.g. because there were no drivers found).
+ */
struct usb_device *usb;
/** List of changed ports */
struct list_head list;