From patchwork Thu Sep 13 01:38:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 1449861 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5B22DDF238 for ; Thu, 13 Sep 2012 01:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752867Ab2IMBiT (ORCPT ); Wed, 12 Sep 2012 21:38:19 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:41045 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091Ab2IMBiS (ORCPT ); Wed, 12 Sep 2012 21:38:18 -0400 Received: by oago6 with SMTP id o6so1489845oag.19 for ; Wed, 12 Sep 2012 18:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=sdt0utpraol6xyxEtC1UXoQudMX1LdWwxoIQVQ1TOyg=; b=onBq84CPH2s+dNheymQVZsmc6Lxpe83kbrgnFb8EnHrwUnNGlVFEOeRN/Cayl1NWRT zkuHfNCVOt8u30fnaaRJTSR9wmVygLN+XtrC2tGYEqEG8dr6PO62LdEu8KdsOiLcfL5l 3XQmVk2dqLOdt2DhEWdqvY4qEd4VEcDRbVlcUmRYXjCdbjCyl7ajttSY1fTyrpzipNGc wOLDGBBaVk2kq/jYM2/c3M0PH6LVDHZy1918jvr8zzvrQTf409Q3obvJ2Q4dJ8+aIkf1 yXFtJ73PwKUd192wXGOA9V0xAGpoCbeVu7E+IlnoeWLkj0ycd96LQT0Cqk5zcqJfYwOg GJ5g== Received: by 10.60.23.161 with SMTP id n1mr304856oef.67.1347500297348; Wed, 12 Sep 2012 18:38:17 -0700 (PDT) Received: from [114.39.96.237] (114-39-96-237.dynamic.hinet.net. [114.39.96.237]) by mx.google.com with ESMTPS id ec1sm22139073obc.2.2012.09.12.18.38.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 18:38:16 -0700 (PDT) Message-ID: <1347500288.7434.1.camel@phoenix> Subject: [PATCH 1/2] HID: hid-sensor-hub: Clear HID_CLAIMED_INPUT bit earlier From: Axel Lin To: Jiri Kosina Cc: srinivas pandruvada , Jonathan Cameron , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 13 Sep 2012 09:38:08 +0800 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Clear HID_CLAIMED_INPUT bit of hdev->claimed, this prevents calling hidinput_disconnect() in hid_disconnect(), which is called by hid_hw_stop(). We need to clear HID_CLAIMED_INPUT bit earlier rather than in sensor_hub_remove() because we also call hid_hw_stop() in sensor_hub_probe error handling. Also adds comments for why we set hdev->claimed = HID_CLAIMED_INPUT. Signed-off-by: Axel Lin --- Hi srinivas, I don't have this hardware, I'd appreciate if you can test these patches. Axel drivers/hid/hid-sensor-hub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 4ac759c..50bc8c7 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -539,8 +539,11 @@ static int sensor_hub_probe(struct hid_device *hdev, } INIT_LIST_HEAD(&hdev->inputs); + /* We don't use hidinput but hid_hw_start() fails if nothing is + * claimed. So spoof claimed input. */ hdev->claimed = HID_CLAIMED_INPUT; ret = hid_hw_start(hdev, 0); + hdev->claimed &= ~HID_CLAIMED_INPUT; if (ret) { hid_err(hdev, "hw start failed\n"); goto err_free; @@ -627,7 +630,6 @@ static void sensor_hub_remove(struct hid_device *hdev) int i; hid_dbg(hdev, " hardware removed\n"); - hdev->claimed &= ~HID_CLAIMED_INPUT; hid_hw_stop(hdev); hid_hw_close(hdev); spin_lock_irqsave(&data->lock, flags);