aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/u_serial.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-09 11:37:00 +0000
committerMark Brown <broonie@linaro.org>2013-12-09 11:37:00 +0000
commiteed4bafd63b5584adb832a582a931ecba41dec55 (patch)
tree5855807caaf53aec80037b2635eb2e2c0744565b /drivers/usb/gadget/u_serial.c
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff)
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
Diffstat (limited to 'drivers/usb/gadget/u_serial.c')
-rw-r--r--drivers/usb/gadget/u_serial.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index b369292d4b9..72068082e83 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -1126,6 +1126,7 @@ int gserial_alloc_line(unsigned char *line_num)
tty_dev = tty_port_register_device(&ports[port_num].port->port,
gs_tty_driver, port_num, NULL);
+
if (IS_ERR(tty_dev)) {
struct gs_port *port;
pr_err("%s: failed to register tty for port %d, err %ld\n",