projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-next
[cascardo/linux.git]
/
drivers
/
usb
/
gadget
/
u_serial.c
diff --git
a/drivers/usb/gadget/u_serial.c
b/drivers/usb/gadget/u_serial.c
index
6c23938
..
09aa920
100644
(file)
--- a/
drivers/usb/gadget/u_serial.c
+++ b/
drivers/usb/gadget/u_serial.c
@@
-917,7
+917,7
@@
static int gs_put_char(struct tty_struct *tty, unsigned char ch)
unsigned long flags;
int status;
unsigned long flags;
int status;
- pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %p\n",
+ pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %p
f
\n",
port->port_num, tty, ch, __builtin_return_address(0));
spin_lock_irqsave(&port->port_lock, flags);
port->port_num, tty, ch, __builtin_return_address(0));
spin_lock_irqsave(&port->port_lock, flags);