From patchwork Thu Sep 13 22:06:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 1454401 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 9C3CEDF24C for ; Thu, 13 Sep 2012 22:06:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754625Ab2IMWGr (ORCPT ); Thu, 13 Sep 2012 18:06:47 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:41451 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753408Ab2IMWGq (ORCPT ); Thu, 13 Sep 2012 18:06:46 -0400 Received: by obbuo13 with SMTP id uo13so5329845obb.19 for ; Thu, 13 Sep 2012 15:06:46 -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:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=76vOaWUOrvXbosvPhjBQ82EHEWxHt3XjLDO/6P81hdY=; b=qveO5axEFhC4Q8ZEkHsh8oGCZ+6Q4gt7/Rg8w8EMkeJqataVH3uR2FgcJ55865uM2A 6a/c2OhIyFOcsS14aSAlOtNcAzBuxWswAWePxpLsv9pTV89hs+T4Y5O0Jw4CMD+CKJYa L2M5PJMEgh8A6FWcZshnIOkgS70OWyB0cdei0L7uBnh8wqTpLuZh42O+vVKXgwduSw/w AQWEdl+tO6b2vcMwUJp6V21t2PiO6FOoF9sT9YnCjxMHAepQEd9ua66ZRFC3sWEy1gc0 uj7OFJ629O0y11zyiUab1UjARUCkouhK3fhkmZPQJxKq01uzm98e9XMMKmE32TzlDESj x4Cg== Received: by 10.60.8.34 with SMTP id o2mr679041oea.99.1347574006365; Thu, 13 Sep 2012 15:06:46 -0700 (PDT) Received: from [114.39.100.174] (114-39-100-174.dynamic.hinet.net. [114.39.100.174]) by mx.google.com with ESMTPS id 2sm25285850obi.20.2012.09.13.15.06.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 15:06:45 -0700 (PDT) Message-ID: <1347574001.8974.6.camel@phoenix> Subject: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() From: Axel Lin To: Jiri Kosina Cc: srinivas pandruvada , Jonathan Cameron , linux-input@vger.kernel.org Date: Fri, 14 Sep 2012 06:06:41 +0800 In-Reply-To: <1347573801.8974.2.camel@phoenix> References: <1347573801.8974.2.camel@phoenix> 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 Also adjust unnecessary change lines for hid_err. Signed-off-by: Axel Lin --- drivers/hid/hid-sensor-hub.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index f9d6209..b9ce38e 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -564,8 +564,7 @@ static int sensor_hub_probe(struct hid_device *hdev, sizeof(struct mfd_cell), GFP_KERNEL); if (sd->hid_sensor_hub_client_devs == NULL) { - hid_err(hdev, - "Failed to allocate memory for mfd cells\n"); + hid_err(hdev, "Failed to allocate memory for mfd cells\n"); ret = -ENOMEM; goto err_close; } @@ -577,8 +576,7 @@ static int sensor_hub_probe(struct hid_device *hdev, name = kasprintf(GFP_KERNEL, "HID-SENSOR-%x", field->physical); if (name == NULL) { - hid_err(hdev, - "Failed MFD device name\n"); + hid_err(hdev, "Failed MFD device name\n"); ret = -ENOMEM; goto err_free_names; } @@ -624,8 +622,8 @@ static void sensor_hub_remove(struct hid_device *hdev) int i; hid_dbg(hdev, " hardware removed\n"); - hid_hw_stop(hdev); hid_hw_close(hdev); + hid_hw_stop(hdev); spin_lock_irqsave(&data->lock, flags); if (data->pending.status) complete(&data->pending.ready);