diff options
| author | Denis Joseph Barrow <D.Barow@option.com> | 2009-01-02 13:50:29 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 10:19:43 -0800 |
| commit | 58eb17f155704062d76729d1fb7e23d3559ca86a (patch) | |
| tree | f57641ce2ee171ce4647522d5c6759356280c4c1 /drivers/net | |
| parent | ad36b88e2d22e9ef42797581d3ecea9feadd9488 (diff) | |
| download | linux-3.10-58eb17f155704062d76729d1fb7e23d3559ca86a.tar.gz linux-3.10-58eb17f155704062d76729d1fb7e23d3559ca86a.tar.bz2 linux-3.10-58eb17f155704062d76729d1fb7e23d3559ca86a.zip | |
hso modem detect fix patch against Alan Cox'es tty tree
Fixed incorrect check for the modem port, this prevents
crashes caused by issueing a tiocmget_submit_urb
on endpoints which don't exist for non modem devices.
Signed-off-by: Denis Joseph Barrow <D.Barow@option.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/usb/hso.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index d974d970e5f..148af34837f 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2663,7 +2663,7 @@ static struct hso_device *hso_create_bulk_serial_device( serial->parent = hso_dev; hso_dev->port_data.dev_serial = serial; - if (port & HSO_PORT_MODEM) { + if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) { num_urbs = 2; serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget), GFP_KERNEL); |