diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-16 17:43:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-16 17:43:53 -0800 |
| commit | 2c0461986d6c336c5dba0880851a1043ab16cca9 (patch) | |
| tree | d563caf5eca52003a3fd115b5f4f907dd91ef8ff /usb | |
| parent | c2c502ef2a4376372e57a92b0a8ecab8bf17bc7d (diff) | |
| download | patches-2c0461986d6c336c5dba0880851a1043ab16cca9.tar.gz | |
2.6.24-rc8 resync
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-export-suspend-statistics.patch | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/usb/usb-export-suspend-statistics.patch b/usb/usb-export-suspend-statistics.patch index facd464c69d848..e0a721b12a2934 100644 --- a/usb/usb-export-suspend-statistics.patch +++ b/usb/usb-export-suspend-statistics.patch @@ -32,8 +32,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/core/hub.c | 10 +++++++++- drivers/usb/core/sysfs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/core/usb.c | 2 ++ - include/linux/usb.h | 2 ++ - 4 files changed, 59 insertions(+), 1 deletion(-) + include/linux/usb.h | 3 +++ + 4 files changed, 60 insertions(+), 1 deletion(-) --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -144,11 +144,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev->authorized = 1; --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -425,6 +425,8 @@ struct usb_device { +@@ -419,12 +419,15 @@ struct usb_device { + u32 quirks; /* quirks of the whole device */ + atomic_t urbnum; /* number of URBs submitted for the whole device */ + ++ unsigned long active_duration; /* total time device is not suspended */ ++ + #ifdef CONFIG_PM + struct delayed_work autosuspend; /* for delayed autosuspends */ + struct mutex pm_mutex; /* protects PM operations */ unsigned long last_busy; /* time of last use */ int autosuspend_delay; /* in jiffies */ -+ unsigned long active_duration; /* total time device is not suspended */ + unsigned long connect_time; /* time device was first connected */ unsigned auto_pm:1; /* autosuspend/resume in progress */ |