projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[~shefty/rdma-dev.git]
/
drivers
/
usb
/
serial
/
option.c
diff --git
a/drivers/usb/serial/option.c
b/drivers/usb/serial/option.c
index a5e63d16658485d00625d74e35f7a5068ffa94fa..748778288d94b649f4dec1cbad1f25ceac85ecb6 100644
(file)
--- a/
drivers/usb/serial/option.c
+++ b/
drivers/usb/serial/option.c
@@
-988,6
+988,7
@@
static struct usb_serial_driver option_1port_device = {
.set_termios = usb_wwan_set_termios,
.tiocmget = usb_wwan_tiocmget,
.tiocmset = usb_wwan_tiocmset,
.set_termios = usb_wwan_set_termios,
.tiocmget = usb_wwan_tiocmget,
.tiocmset = usb_wwan_tiocmset,
+ .ioctl = usb_wwan_ioctl,
.attach = usb_wwan_startup,
.disconnect = usb_wwan_disconnect,
.release = usb_wwan_release,
.attach = usb_wwan_startup,
.disconnect = usb_wwan_disconnect,
.release = usb_wwan_release,