From patchwork Mon Dec 8 14:38:31 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Joseph Barrow X-Patchwork-Id: 12775 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id F2A3DDDED0 for ; Tue, 9 Dec 2008 01:39:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752490AbYLHOiz (ORCPT ); Mon, 8 Dec 2008 09:38:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752143AbYLHOiy (ORCPT ); Mon, 8 Dec 2008 09:38:54 -0500 Received: from mailer2.option.com ([81.246.70.163]:21453 "EHLO mailer2.option.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819AbYLHOix (ORCPT ); Mon, 8 Dec 2008 09:38:53 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsgAANu/PEkKAAAZ/2dsb2JhbAAIziqDBQ Received: from unknown (HELO smtp3.option.com) ([10.0.0.25]) by mailer2.option.local with ESMTP; 08 Dec 2008 15:38:36 +0100 Received: from [10.30.1.46] ([10.30.1.46]) by smtp3.option.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 8 Dec 2008 15:38:35 +0100 Message-ID: <493D3167.200@option.com> Date: Mon, 08 Dec 2008 15:38:31 +0100 From: Denis Joseph Barrow User-Agent: Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: Alan Cox CC: Linux netdev Mailing list , Linux USB kernel mailing list Subject: [PATCH1/1] hso modem detect fix patch against Alan Cox'es tty tree X-OriginalArrivalTime: 08 Dec 2008 14:38:35.0519 (UTC) FILETIME=[A6A318F0:01C95942] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Here you go good sir, 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 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 --- Index: linux-2.6.28-rc7.alan/drivers/net/usb/hso.c =================================================================== --- linux-2.6.28-rc7.alan.orig/drivers/net/usb/hso.c 2008-12-08 15:26:00.000000000 +0100 +++ linux-2.6.28-rc7.alan/drivers/net/usb/hso.c 2008-12-08 15:28:10.000000000 +0100 @@ -2659,7 +2659,7 @@ 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);