diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/hub.c | 6 | ||||
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb_con.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d20cb545a6e4..60a8f55a0cc7 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1407,7 +1407,11 @@ fail: | |||
1407 | 1407 | ||
1408 | 1408 | ||
1409 | /** | 1409 | /** |
1410 | * Similar to usb_disconnect() | 1410 | * usb_deauthorize_device - deauthorize a device (usbcore-internal) |
1411 | * @usb_dev: USB device | ||
1412 | * | ||
1413 | * Move the USB device to a very basic state where interfaces are disabled | ||
1414 | * and the device is in fact unconfigured and unusable. | ||
1411 | * | 1415 | * |
1412 | * We share a lock (that we have) with device_del(), so we need to | 1416 | * We share a lock (that we have) with device_del(), so we need to |
1413 | * defer its call. | 1417 | * defer its call. |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index 43722e5a49d1..b624320df903 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c | |||
@@ -1042,7 +1042,8 @@ sisusbcon_set_origin(struct vc_data *c) | |||
1042 | 1042 | ||
1043 | /* Interface routine */ | 1043 | /* Interface routine */ |
1044 | static int | 1044 | static int |
1045 | sisusbcon_resize(struct vc_data *c, unsigned int newcols, unsigned int newrows) | 1045 | sisusbcon_resize(struct vc_data *c, unsigned int newcols, unsigned int newrows, |
1046 | unsigned int user) | ||
1046 | { | 1047 | { |
1047 | struct sisusb_usb_data *sisusb; | 1048 | struct sisusb_usb_data *sisusb; |
1048 | int fh; | 1049 | int fh; |