From patchwork Tue Mar 1 20:24:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 8470031 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AF5119F2F0 for ; Tue, 1 Mar 2016 20:24:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3C63202E5 for ; Tue, 1 Mar 2016 20:24:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA057202AE for ; Tue, 1 Mar 2016 20:24:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbcCAUYj (ORCPT ); Tue, 1 Mar 2016 15:24:39 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35368 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751439AbcCAUYi (ORCPT ); Tue, 1 Mar 2016 15:24:38 -0500 Received: by mail-wm0-f47.google.com with SMTP id l68so55114248wml.0; Tue, 01 Mar 2016 12:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=ZcJv78a9AsnqIXDfXSVKhXbwxHHVVOEu8DyPf1zHnPk=; b=swNZLQlDTUxDnUY/LgdEHm2pUITZza3TN4wpTmbNqUIe2YsRx/jsdMJcF4kkyWeYYl YcWe28r/1yj/GjZ/gs1MmBeTUPwoDEOSB2wkz5k/ea4TqN9joG1WRM7sdywgfA6yl4Vt P7vYnnJ1pXL2of5CDgExJeHVswMGw2kUVU0+VBCyhdZlowP+w35pt2CVe1ch1JZZdPrK YqcMNm5FxMke65B4T/GMZt4lY6f/a6mGAwaOxaWHCSyVAELSN7h9sjwH/3xGH2u6Oehf S1qs216kZ7Gpd4qvkE99lp5uyIfi5Rz/vDLCcv/qfvd/V86Teo2CvrI8oaLWRG2mjVee KiLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=ZcJv78a9AsnqIXDfXSVKhXbwxHHVVOEu8DyPf1zHnPk=; b=KSH4zOtPq8n8c3wKmWNEKy9BiC0AAapdRdbgJT1jU5FN4uue98rZ+U0Hw2TL/caGiC u4QBgbTVds2MulZHuZ6kQrn3LD+YPBWG125Q7D3FEHwu3b0UhbD/2fWr0/6aSdseJnWp IDrj2cSm/XHXywHJkwUxIOQuTTcwkY9rXqEnIJ0sQIUvLy2mDeN1MDz7tTnh6CMxNdYN qwfsbmgF47AzJYZtTMODyi8WICkbUADqU1YbJDM6gpCanoxnWYB6EsJCXGvwpInBo/t0 Tp0qfoVrTDZuad8u2hxyTtlyCUUnGWeXezkrrsUF90fpoYXWKLmrmo/xiOSuk8DXFiyD XBqA== X-Gm-Message-State: AD7BkJLpTLZNO/Gd38eHKmOND6Q2r6gJ7hTNFPHUtuxA/x5AvqEir1XpFl/a40bOp6mx0A== X-Received: by 10.194.60.165 with SMTP id i5mr26584789wjr.178.1456863876875; Tue, 01 Mar 2016 12:24:36 -0800 (PST) Received: from ?IPv6:2003:62:5f55:ba00:2d63:f2b8:abe7:9116? (p200300625F55BA002D63F2B8ABE79116.dip0.t-ipconnect.de. [2003:62:5f55:ba00:2d63:f2b8:abe7:9116]) by smtp.googlemail.com with ESMTPSA id w136sm799252wmw.0.2016.03.01.12.24.34 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Mar 2016 12:24:36 -0800 (PST) To: Benjamin Tissoires Cc: Jiri Kosina , Jacek Anaszewski , linux-input@vger.kernel.org, linux-leds@vger.kernel.org From: Heiner Kallweit Subject: [PATCH] hid: thingm: reorder calls in thingm_probe Message-ID: <56D5FA62.5000203@gmail.com> Date: Tue, 1 Mar 2016 21:24:02 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 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 Based on a suggestion from Benjamin move hid_hw_start() after thingm_version() to avoid potential races. Signed-off-by: Heiner Kallweit --- drivers/hid/hid-thingm.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c index f4196ac..847a497 100644 --- a/drivers/hid/hid-thingm.c +++ b/drivers/hid/hid-thingm.c @@ -216,17 +216,13 @@ static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id) err = hid_parse(hdev); if (err) - goto error; - - err = hid_hw_start(hdev, HID_CONNECT_HIDRAW); - if (err) - goto error; + return err; mutex_init(&tdev->lock); err = thingm_version(tdev); if (err) - goto stop; + return err; hid_dbg(hdev, "firmware version: %c.%c\n", tdev->version.major, tdev->version.minor); @@ -237,17 +233,18 @@ static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id) if (!tdev->fwinfo) { hid_err(hdev, "unsupported firmware %c\n", tdev->version.major); - err = -ENODEV; - goto stop; + return -ENODEV; } tdev->rgb = devm_kzalloc(&hdev->dev, sizeof(struct thingm_rgb) * tdev->fwinfo->numrgb, GFP_KERNEL); - if (!tdev->rgb) { - err = -ENOMEM; - goto stop; - } + if (!tdev->rgb) + return -ENOMEM; + + err = hid_hw_start(hdev, HID_CONNECT_HIDRAW); + if (err) + return err; for (i = 0; i < tdev->fwinfo->numrgb; ++i) { struct thingm_rgb *rgb = tdev->rgb + i; @@ -255,15 +252,13 @@ static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id) rgb->tdev = tdev; rgb->num = tdev->fwinfo->first + i; err = thingm_init_rgb(rgb); - if (err) - goto stop; + if (err) { + hid_hw_stop(hdev); + return err; + } } return 0; -stop: - hid_hw_stop(hdev); -error: - return err; } static const struct hid_device_id thingm_table[] = {