usb: core: add sysfs entry for usb device state

[sfrench/cifs-2.6.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 97a0f8faea6e5ff33ee9b695850c13c5c8e7f657..a739403a9e455a1f6ddf3f51fa9e96b4d9e67e5e 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2018,6 +2018,19 @@ bool usb_device_is_owned(struct usb_device *udev)
        return !!hub->ports[udev->portnum - 1]->port_owner;
 }
 
+static void update_port_device_state(struct usb_device *udev)
+{
+       struct usb_hub *hub;
+       struct usb_port *port_dev;
+
+       if (udev->parent) {
+               hub = usb_hub_to_struct_hub(udev->parent);
+               port_dev = hub->ports[udev->portnum - 1];
+               WRITE_ONCE(port_dev->state, udev->state);
+               sysfs_notify_dirent(port_dev->state_kn);
+       }
+}
+
 static void recursively_mark_NOTATTACHED(struct usb_device *udev)
 {
        struct usb_hub *hub = usb_hub_to_struct_hub(udev);
@@ -2030,6 +2043,7 @@ static void recursively_mark_NOTATTACHED(struct usb_device *udev)
        if (udev->state == USB_STATE_SUSPENDED)
                udev->active_duration -= jiffies;
        udev->state = USB_STATE_NOTATTACHED;
+       update_port_device_state(udev);
 }
 
 /**
@@ -2086,6 +2100,7 @@ void usb_set_device_state(struct usb_device *udev,
                                udev->state != USB_STATE_SUSPENDED)
                        udev->active_duration += jiffies;
                udev->state = new_state;
+               update_port_device_state(udev);
        } else
                recursively_mark_NOTATTACHED(udev);
        spin_unlock_irqrestore(&device_state_lock, flags);