diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2008-03-06 17:00:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:41 -0400 |
commit | 70a1c9e086c2e267fbc4533cb870f34999b531d6 (patch) | |
tree | f599883bdc2f04d4ca4760dfdb1f1131fa6b7060 /drivers/usb/misc/usbtest.c | |
parent | e1879b19b0abdb387e4aeb0b935a486cc75042fb (diff) |
USB: remove dev->power.power_state
power.power_state is scheduled for removal. This patch (as1053)
removes all uses of that field from drivers/usb. Almost all of them
were write-only, the most significant exceptions being sl811-hcd.c and
u132-hcd.c.
Part of this patch was written by Pavel Machek.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 17100471e461..2c4fd4d6df95 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -1564,7 +1564,8 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf) | |||
1564 | if (mutex_lock_interruptible(&dev->lock)) | 1564 | if (mutex_lock_interruptible(&dev->lock)) |
1565 | return -ERESTARTSYS; | 1565 | return -ERESTARTSYS; |
1566 | 1566 | ||
1567 | if (intf->dev.power.power_state.event != PM_EVENT_ON) { | 1567 | /* FIXME: What if a system sleep starts while a test is running? */ |
1568 | if (!intf->is_active) { | ||
1568 | mutex_unlock(&dev->lock); | 1569 | mutex_unlock(&dev->lock); |
1569 | return -EHOSTUNREACH; | 1570 | return -EHOSTUNREACH; |
1570 | } | 1571 | } |