From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C7B4C3F2C6 for ; Tue, 3 Mar 2020 18:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D1C3206E6 for ; Tue, 3 Mar 2020 18:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258453; bh=DE5YWSbha798yCuN0NyX42YbVoLZfyj4BR5jjOdp1YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ixXGpCWe/5xDTwkDtmA85JCI7FG3ZbPXxBl8aMM0/f31vKAYjqfeI+ChdqU57WU/y 8Y8Lf9pw3Xwrv3FAawP/9Y5IOgP6BeWumczjWVUy9OTBkFGOduMYrlfsQBeuOkWWoH A+nvPmqehEFd8d5vVYy5zh8wmdHrJP7O5ddXC6mw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387856AbgCCSAv (ORCPT ); Tue, 3 Mar 2020 13:00:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:44732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387842AbgCCSAs (ORCPT ); Tue, 3 Mar 2020 13:00:48 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8407F20836; Tue, 3 Mar 2020 18:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258447; bh=DE5YWSbha798yCuN0NyX42YbVoLZfyj4BR5jjOdp1YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S+T5cxCBwf9C/P4oxT4Gf2JM4kM5ybCbJNCB6bcN3JXln27RbovkRmvYCNKQCjDGG yBFk7JgML6phalehjIfhJhlGsQEi11FSITLWofTcx4KilsrRRHlcXH9gKiuIEjC4Md TNMuX111uaKd3py4V6l8fRI/dl5ZGwgT9e+PZZ0Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Jiri Kosina Subject: [PATCH 4.19 52/87] HID: alps: Fix an error handling path in alps_input_configured() Date: Tue, 3 Mar 2020 18:43:43 +0100 Message-Id: <20200303174355.026993631@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174349.075101355@linuxfoundation.org> References: <20200303174349.075101355@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET commit 8d2e77b39b8fecb794e19cd006a12f90b14dd077 upstream. They are issues: - if 'input_allocate_device()' fails and return NULL, there is no need to free anything and 'input_free_device()' call is a no-op. It can be axed. - 'ret' is known to be 0 at this point, so we must set it to a meaningful value before returning Fixes: 2562756dde55 ("HID: add Alps I2C HID Touchpad-Stick support") Signed-off-by: Christophe JAILLET Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/hid-alps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -734,7 +734,7 @@ static int alps_input_configured(struct if (data->has_sp) { input2 = input_allocate_device(); if (!input2) { - input_free_device(input2); + ret = -ENOMEM; goto exit; }