From patchwork Sat Jul 26 14:42:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Lentin X-Patchwork-Id: 4627221 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 E19939F2B8 for ; Sat, 26 Jul 2014 14:42:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19990201CD for ; Sat, 26 Jul 2014 14:42:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBE3F20179 for ; Sat, 26 Jul 2014 14:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751874AbaGZOmg (ORCPT ); Sat, 26 Jul 2014 10:42:36 -0400 Received: from marmot.wormnet.eu ([188.246.204.87]:38475 "EHLO marmot.wormnet.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751717AbaGZOmg (ORCPT ); Sat, 26 Jul 2014 10:42:36 -0400 Received: from [80.229.158.163] (helo=gonzo.vandergast.wormnet.eu) by marmot.wormnet.eu with esmtpa (Exim 4.80) (envelope-from ) id 1XB3B9-0000Ay-TY; Sat, 26 Jul 2014 15:42:31 +0100 From: Jamie Lentin To: Jiri Kosina , Antonio Ospite , Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Jamie Lentin Subject: [PATCH v6 3/4] HID: lenovo: Don't call function in condition, show error codes Date: Sat, 26 Jul 2014 15:42:27 +0100 Message-Id: <1406385747-2444-1-git-send-email-jm@lentin.co.uk> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1406154648-14000-4-git-send-email-jm@lentin.co.uk> References: <1406154648-14000-4-git-send-email-jm@lentin.co.uk> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Signed-off-by: Jamie Lentin Reviewed-by: Dmitry Torokhov --- drivers/hid/hid-lenovo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index a56b9e7..f96bf09 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -350,6 +350,7 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) size_t name_sz = strlen(dev_name(dev)) + 16; char *name_mute, *name_micmute; int i; + int ret; /* * Only register extra settings against subdevice where input_mapping @@ -368,10 +369,9 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, 3, 0, 2)) return -ENODEV; - if (sysfs_create_group(&hdev->dev.kobj, - &lenovo_attr_group_tpkbd)) { - hid_warn(hdev, "Could not create sysfs group\n"); - } + ret = sysfs_create_group(&hdev->dev.kobj, &lenovo_attr_group_tpkbd); + if (ret) + hid_warn(hdev, "Could not create sysfs group: %d\n", ret); data_pointer = devm_kzalloc(&hdev->dev, sizeof(struct lenovo_drvdata_tpkbd),