git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: whiteheat: fix broken port configuration
[pandora-kernel.git]
/
drivers
/
usb
/
serial
/
whiteheat.c
diff --git
a/drivers/usb/serial/whiteheat.c
b/drivers/usb/serial/whiteheat.c
index
5b073bc
..
0ec60cd
100644
(file)
--- a/
drivers/usb/serial/whiteheat.c
+++ b/
drivers/usb/serial/whiteheat.c
@@
-576,6
+576,7
@@
no_firmware:
"%s: please contact support@connecttech.com\n",
serial->type->description);
kfree(result);
"%s: please contact support@connecttech.com\n",
serial->type->description);
kfree(result);
+ kfree(command);
return -ENODEV;
no_command_private:
return -ENODEV;
no_command_private:
@@
-1208,7
+1209,7
@@
static void firm_setup_port(struct tty_struct *tty)
struct whiteheat_port_settings port_settings;
unsigned int cflag = tty->termios->c_cflag;
struct whiteheat_port_settings port_settings;
unsigned int cflag = tty->termios->c_cflag;
- port_settings.port = port->number + 1;
+ port_settings.port = port->number
- port->serial->minor
+ 1;
/* get the byte size */
switch (cflag & CSIZE) {
/* get the byte size */
switch (cflag & CSIZE) {