From patchwork Thu Sep 13 22:05:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 1454391 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0FA2F3FE79 for ; Thu, 13 Sep 2012 22:05:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752944Ab2IMWFS (ORCPT ); Thu, 13 Sep 2012 18:05:18 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:65048 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752753Ab2IMWFR (ORCPT ); Thu, 13 Sep 2012 18:05:17 -0400 Received: by oago6 with SMTP id o6so2334821oag.19 for ; Thu, 13 Sep 2012 15:05: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:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=wnDbGOi6ACTTQvo6Mt8pCOpKsNLDhCgJC/lUUKw2Qf0=; b=qVtL/HMPrm9G/Cj2ftVihJaypTqWgerMJfyB1DoFDP20f7Rrafx2v7KLMkbD2nEVjz 6OjxRfCW0qP/71JKbh2FBZ4FWb58z9vT7W+ujH70+lkLz8JvsZUtNnewWEd4ClFXOVRB sxGRLUvNkOS/CwyNY97wvNJYyE4wIDKxB3fmlCsWTD05bpvmkzz6NtNO1h1FFcj5ZT1I yvDBILzRLcqI/MZIl0f+BauXvRztB7serk2JpVVmRNCGXHkcf0rPDueBks36txw/1+y6 yiCHg8tEw8jRWcIzUnQReIFnE+M4hF0kfirY2wSO26qVYolIDKy+cvUukQ53uyjC56Op 0j4g== Received: by 10.60.170.229 with SMTP id ap5mr678747oec.101.1347573917082; Thu, 13 Sep 2012 15:05:17 -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 d4sm25295726obx.3.2012.09.13.15.05.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 15:05:16 -0700 (PDT) Message-ID: <1347573912.8974.4.camel@phoenix> Subject: [PATCH 2/3] HID: hid-sensor-hub: Fix sensor_hub_probe error handling From: Axel Lin To: Jiri Kosina Cc: srinivas pandruvada , Jonathan Cameron , linux-input@vger.kernel.org Date: Fri, 14 Sep 2012 06:05:12 +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 Fix below issues in sensor_hub_probe error handling: 1. In the case of goto err_close, hid_hw_stop(hdev) is called twice. Fix it. 2. If fails to allocate MFD device name, we also need to free all sucessfully allocated names in previous iterations. Signed-off-by: Axel Lin --- drivers/hid/hid-sensor-hub.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 1faacf2..f9d6209 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -580,7 +580,7 @@ static int sensor_hub_probe(struct hid_device *hdev, hid_err(hdev, "Failed MFD device name\n"); ret = -ENOMEM; - goto err_free_cells; + goto err_free_names; } sd->hid_sensor_hub_client_devs[ sd->hid_sensor_client_cnt].name = name; @@ -604,10 +604,8 @@ static int sensor_hub_probe(struct hid_device *hdev, err_free_names: for (i = 0; i < sd->hid_sensor_client_cnt ; ++i) kfree(sd->hid_sensor_hub_client_devs[i].name); -err_free_cells: kfree(sd->hid_sensor_hub_client_devs); err_close: - hid_hw_stop(hdev); hid_hw_close(hdev); err_stop_hw: hid_hw_stop(hdev);