diff options
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb.c')
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 41ef2b606751..3260d595441f 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
@@ -863,9 +863,6 @@ static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr, | |||
863 | 863 | ||
864 | switch (length) { | 864 | switch (length) { |
865 | 865 | ||
866 | case 0: | ||
867 | return ret; | ||
868 | |||
869 | case 1: | 866 | case 1: |
870 | if (userbuffer) { | 867 | if (userbuffer) { |
871 | if (get_user(swap8, (u8 __user *)userbuffer)) | 868 | if (get_user(swap8, (u8 __user *)userbuffer)) |
@@ -1221,9 +1218,6 @@ static int sisusb_read_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr, | |||
1221 | 1218 | ||
1222 | switch (length) { | 1219 | switch (length) { |
1223 | 1220 | ||
1224 | case 0: | ||
1225 | return ret; | ||
1226 | |||
1227 | case 1: | 1221 | case 1: |
1228 | 1222 | ||
1229 | ret |= sisusb_read_memio_byte(sisusb, SISUSB_TYPE_MEM, | 1223 | ret |= sisusb_read_memio_byte(sisusb, SISUSB_TYPE_MEM, |
@@ -2443,8 +2437,8 @@ sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init) | |||
2443 | u8 *tempbuf; | 2437 | u8 *tempbuf; |
2444 | u16 *tempbufb; | 2438 | u16 *tempbufb; |
2445 | size_t written; | 2439 | size_t written; |
2446 | static char bootstring[] = "SiSUSB VGA text console, (C) 2005 Thomas Winischhofer."; | 2440 | static const char bootstring[] = "SiSUSB VGA text console, (C) 2005 Thomas Winischhofer."; |
2447 | static char bootlogo[] = "(o_ //\\ V_/_"; | 2441 | static const char bootlogo[] = "(o_ //\\ V_/_"; |
2448 | 2442 | ||
2449 | /* sisusb->lock is down */ | 2443 | /* sisusb->lock is down */ |
2450 | 2444 | ||
@@ -3489,7 +3483,6 @@ static struct usb_device_id sisusb_table [] = { | |||
3489 | MODULE_DEVICE_TABLE (usb, sisusb_table); | 3483 | MODULE_DEVICE_TABLE (usb, sisusb_table); |
3490 | 3484 | ||
3491 | static struct usb_driver sisusb_driver = { | 3485 | static struct usb_driver sisusb_driver = { |
3492 | .owner = THIS_MODULE, | ||
3493 | .name = "sisusb", | 3486 | .name = "sisusb", |
3494 | .probe = sisusb_probe, | 3487 | .probe = sisusb_probe, |
3495 | .disconnect = sisusb_disconnect, | 3488 | .disconnect = sisusb_disconnect, |