diff options
Diffstat (limited to 'drivers/usb/serial/ark3116.c')
-rw-r--r-- | drivers/usb/serial/ark3116.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index 599ab2e548a7..77895c8f8f31 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
25 | #include <linux/usb/serial.h> | 25 | #include <linux/usb/serial.h> |
26 | #include <linux/serial.h> | 26 | #include <linux/serial.h> |
27 | #include <asm/uaccess.h> | 27 | #include <linux/uaccess.h> |
28 | 28 | ||
29 | 29 | ||
30 | static int debug; | 30 | static int debug; |
@@ -246,29 +246,29 @@ static void ark3116_set_termios(struct usb_serial_port *port, | |||
246 | baud = tty_get_baud_rate(port->tty); | 246 | baud = tty_get_baud_rate(port->tty); |
247 | 247 | ||
248 | switch (baud) { | 248 | switch (baud) { |
249 | case 75: | 249 | case 75: |
250 | case 150: | 250 | case 150: |
251 | case 300: | 251 | case 300: |
252 | case 600: | 252 | case 600: |
253 | case 1200: | 253 | case 1200: |
254 | case 1800: | 254 | case 1800: |
255 | case 2400: | 255 | case 2400: |
256 | case 4800: | 256 | case 4800: |
257 | case 9600: | 257 | case 9600: |
258 | case 19200: | 258 | case 19200: |
259 | case 38400: | 259 | case 38400: |
260 | case 57600: | 260 | case 57600: |
261 | case 115200: | 261 | case 115200: |
262 | case 230400: | 262 | case 230400: |
263 | case 460800: | 263 | case 460800: |
264 | /* Report the resulting rate back to the caller */ | 264 | /* Report the resulting rate back to the caller */ |
265 | tty_encode_baud_rate(port->tty, baud, baud); | 265 | tty_encode_baud_rate(port->tty, baud, baud); |
266 | break; | 266 | break; |
267 | /* set 9600 as default (if given baudrate is invalid for example) */ | 267 | /* set 9600 as default (if given baudrate is invalid for example) */ |
268 | default: | 268 | default: |
269 | tty_encode_baud_rate(port->tty, 9600, 9600); | 269 | tty_encode_baud_rate(port->tty, 9600, 9600); |
270 | case 0: | 270 | case 0: |
271 | baud = 9600; | 271 | baud = 9600; |
272 | } | 272 | } |
273 | 273 | ||
274 | /* | 274 | /* |
@@ -380,19 +380,19 @@ static int ark3116_ioctl(struct usb_serial_port *port, struct file *file, | |||
380 | switch (cmd) { | 380 | switch (cmd) { |
381 | case TIOCGSERIAL: | 381 | case TIOCGSERIAL: |
382 | /* XXX: Some of these values are probably wrong. */ | 382 | /* XXX: Some of these values are probably wrong. */ |
383 | memset(&serstruct, 0, sizeof (serstruct)); | 383 | memset(&serstruct, 0, sizeof(serstruct)); |
384 | serstruct.type = PORT_16654; | 384 | serstruct.type = PORT_16654; |
385 | serstruct.line = port->serial->minor; | 385 | serstruct.line = port->serial->minor; |
386 | serstruct.port = port->number; | 386 | serstruct.port = port->number; |
387 | serstruct.custom_divisor = 0; | 387 | serstruct.custom_divisor = 0; |
388 | serstruct.baud_base = 460800; | 388 | serstruct.baud_base = 460800; |
389 | 389 | ||
390 | if (copy_to_user(user_arg, &serstruct, sizeof (serstruct))) | 390 | if (copy_to_user(user_arg, &serstruct, sizeof(serstruct))) |
391 | return -EFAULT; | 391 | return -EFAULT; |
392 | 392 | ||
393 | return 0; | 393 | return 0; |
394 | case TIOCSSERIAL: | 394 | case TIOCSSERIAL: |
395 | if (copy_from_user(&serstruct, user_arg, sizeof (serstruct))) | 395 | if (copy_from_user(&serstruct, user_arg, sizeof(serstruct))) |
396 | return -EFAULT; | 396 | return -EFAULT; |
397 | return 0; | 397 | return 0; |
398 | default: | 398 | default: |