Commit 58eb17f1 authored by Denis Joseph Barrow's avatar Denis Joseph Barrow Committed by Linus Torvalds

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: default avatarDenis Joseph Barrow <D.Barow@option.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad36b88e
...@@ -2663,7 +2663,7 @@ static struct hso_device *hso_create_bulk_serial_device( ...@@ -2663,7 +2663,7 @@ static struct hso_device *hso_create_bulk_serial_device(
serial->parent = hso_dev; serial->parent = hso_dev;
hso_dev->port_data.dev_serial = serial; hso_dev->port_data.dev_serial = serial;
if (port & HSO_PORT_MODEM) { if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
num_urbs = 2; num_urbs = 2;
serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget), serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),
GFP_KERNEL); GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment