diff options
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 54799eb0bc60..90a96257d6ce 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -983,6 +983,7 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param) | |||
983 | reqp->number = i % NUM_SUBCASES; | 983 | reqp->number = i % NUM_SUBCASES; |
984 | reqp->expected = expected; | 984 | reqp->expected = expected; |
985 | u->setup_packet = (char *) &reqp->setup; | 985 | u->setup_packet = (char *) &reqp->setup; |
986 | u->transfer_flags |= URB_NO_SETUP_DMA_MAP; | ||
986 | 987 | ||
987 | u->context = &context; | 988 | u->context = &context; |
988 | u->complete = ctrl_complete; | 989 | u->complete = ctrl_complete; |
@@ -1948,21 +1949,11 @@ usbtest_probe (struct usb_interface *intf, const struct usb_device_id *id) | |||
1948 | 1949 | ||
1949 | static int usbtest_suspend (struct usb_interface *intf, pm_message_t message) | 1950 | static int usbtest_suspend (struct usb_interface *intf, pm_message_t message) |
1950 | { | 1951 | { |
1951 | struct usbtest_dev *dev = usb_get_intfdata (intf); | ||
1952 | |||
1953 | down (&dev->sem); | ||
1954 | intf->dev.power.power_state = PMSG_SUSPEND; | ||
1955 | up (&dev->sem); | ||
1956 | return 0; | 1952 | return 0; |
1957 | } | 1953 | } |
1958 | 1954 | ||
1959 | static int usbtest_resume (struct usb_interface *intf) | 1955 | static int usbtest_resume (struct usb_interface *intf) |
1960 | { | 1956 | { |
1961 | struct usbtest_dev *dev = usb_get_intfdata (intf); | ||
1962 | |||
1963 | down (&dev->sem); | ||
1964 | intf->dev.power.power_state = PMSG_ON; | ||
1965 | up (&dev->sem); | ||
1966 | return 0; | 1957 | return 0; |
1967 | } | 1958 | } |
1968 | 1959 | ||