From patchwork Fri Jul 25 05:13:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reyad Attiyat X-Patchwork-Id: 4621381 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 745449F36A for ; Fri, 25 Jul 2014 05:13:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97873201EF for ; Fri, 25 Jul 2014 05:13:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6C55201DC for ; Fri, 25 Jul 2014 05:13:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750911AbaGYFNa (ORCPT ); Fri, 25 Jul 2014 01:13:30 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:49601 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbaGYFNa (ORCPT ); Fri, 25 Jul 2014 01:13:30 -0400 Received: by mail-pa0-f53.google.com with SMTP id kq14so5274579pab.26 for ; Thu, 24 Jul 2014 22:13:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XbJWFoZAp65ULL33qYNfEJxmG3R2NMjoO/1FprPhZpQ=; b=VFs70Hmydy4rp/NHP40Z/evRw33fErJSvNEZB/C0c6ZHtjxjH4WmxE/rKyKfb+tno1 fH2i6LLZqEExUFQtBer0IXFUP5L6eAQLkZVqpdn+mf6E3RRxu7JjGL5R0bmb2iOBmA/9 4omF11QqU7eIyOai6u28GqWlk8dqA6iDb8xPeqBv4ZkQMT0o5oj8B/mF3kKP3kJqvprJ Vcb4S63mph3TFVnOXQrPfd5KHuVNnbgZODlS2gEwbIKeFu+xJk/jidqOabfprsnqaeR5 8OcDLSA69wS+ykCi7Jl0rDjoXg4mByMRcwLIt+PIckcq9Bx426xNXIhzRaKmCpiOwWsz EkqA== X-Received: by 10.66.231.139 with SMTP id tg11mr16013377pac.87.1406265209505; Thu, 24 Jul 2014 22:13:29 -0700 (PDT) Received: from localhost.net (S01066805ca01c45c.wp.shawcable.net. [24.76.189.120]) by mx.google.com with ESMTPSA id yb4sm7439587pbb.9.2014.07.24.22.13.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2014 22:13:28 -0700 (PDT) From: Reyad Attiyat To: linux-input@vger.kernel.org, jkosina@suse.cz, srinivas.pandruvada@linux.intel.com, linux-kernel@vger.kernel.org Cc: Reyad Attiyat Subject: [PATCH] hid: usbhid: Use flag HID_DISCONNECTED when a usb device is removed Date: Fri, 25 Jul 2014 00:13:01 -0500 Message-Id: <1406265181-4009-1-git-send-email-reyad.attiyat@gmail.com> X-Mailer: git-send-email 1.9.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Set disconnected flag in struct usbhid when a usb device is removed. Check for disconnected flag before sending urb requests. This prevents a kernel panic when a hid driver calls hid_hw_request() after removing a usb device. Signed-off-by: Reyad Attiyat --- drivers/hid/usbhid/hid-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 7b88f4c..c8fa957 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -536,7 +536,8 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re int head; struct usbhid_device *usbhid = hid->driver_data; - if ((hid->quirks & HID_QUIRK_NOGET) && dir == USB_DIR_IN) + if (((hid->quirks & HID_QUIRK_NOGET) && dir == USB_DIR_IN) || + test_bit(HID_DISCONNECTED, &usbhid->iofl)) return; if (usbhid->urbout && dir == USB_DIR_OUT && report->type == HID_OUTPUT_REPORT) { @@ -1366,6 +1367,9 @@ static void usbhid_disconnect(struct usb_interface *intf) return; usbhid = hid->driver_data; + spin_lock_irq(&usbhid->lock); /* Sync with error and led handlers */ + set_bit(HID_DISCONNECTED, &usbhid->iofl); + spin_unlock_irq(&usbhid->lock); hid_destroy_device(hid); kfree(usbhid); }