From: Denis Joseph Barrow Date: Fri, 2 Jan 2009 13:50:29 +0000 (+0000) Subject: hso modem detect fix patch against Alan Cox'es tty tree X-Git-Tag: v3.12-rc1~16843^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58eb17f155704062d76729d1fb7e23d3559ca86a;p=kernel%2Fkernel-generic.git 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 Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index d974d97..148af34 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);