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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 3A741C43381 for ; Tue, 26 Mar 2019 06:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01B152070B for ; Tue, 26 Mar 2019 06:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553582844; bh=7daqbbtkWfmInTArg8gSIKW6YSqqD57S5aM6bKnEz3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZV07GsVbBhGrBjdTrTsU2B7de3ylv3I845Olbpk+TUwffOZ2els7yErGmyphhIm7m b9KzCsuY+TwyGeicj8tOIhoLFEhNolovG9lz9/JGsgW78ADQizC0Mz2Kz3hWHa17qB F8IbXMD0VCLonr18qmA3/RAmJoATHQwoSIT68Vhc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731396AbfCZGcS (ORCPT ); Tue, 26 Mar 2019 02:32:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:41680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731389AbfCZGcR (ORCPT ); Tue, 26 Mar 2019 02:32:17 -0400 Received: from localhost (unknown [104.132.152.111]) (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 ACE9420823; Tue, 26 Mar 2019 06:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553581936; bh=7daqbbtkWfmInTArg8gSIKW6YSqqD57S5aM6bKnEz3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ogGevcsjBQ5J9mhK+w9k0VpfRAzakyhGq99SVrKtgNuhS6EhvpOFFL0eZfj/PhFJE F8BFGCBVJGqtmzWfwRXez2O0wpigBe8LF7uHRiXv/4AnBpjuVczADUKI9BaZ8mfJtN TA+eZA5fegTTtE6NK0dSdXDuqY7pLPVzoPr1NSdg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Baolin Wang , Sebastian Reichel Subject: [PATCH 4.9 29/30] power: supply: charger-manager: Fix incorrect return value Date: Tue, 26 Mar 2019 15:30:08 +0900 Message-Id: <20190326042608.539968138@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190326042607.558087893@linuxfoundation.org> References: <20190326042607.558087893@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baolin Wang commit f25a646fbe2051527ad9721853e892d13a99199e upstream. Fix incorrect return value. Signed-off-by: Baolin Wang Signed-off-by: Sebastian Reichel Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/charger-manager.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1212,7 +1212,6 @@ static int charger_extcon_init(struct ch if (ret < 0) { pr_info("Cannot register extcon_dev for %s(cable: %s)\n", cable->extcon_name, cable->name); - ret = -EINVAL; } return ret; @@ -1634,7 +1633,7 @@ static int charger_manager_probe(struct if (IS_ERR(desc)) { dev_err(&pdev->dev, "No platform data (desc) found\n"); - return -ENODEV; + return PTR_ERR(desc); } cm = devm_kzalloc(&pdev->dev,