From patchwork Tue Mar 17 10:55:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229204 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 4D328C2BB1D for ; Tue, 17 Mar 2020 11:20:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C2462071C for ; Tue, 17 Mar 2020 11:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584444038; bh=6RgVC7PG6F38PUNRjg8qI+Jf2B32drE7YGtE2f8ELfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aYJkBEh+gX0wJFHCwRed3ns9i2HPT4Et7DYqRxmC6vUXxz9Vy9vrld+MF57dL9IDs +iOBwkE0/FLT1He+AaZWNlHao96uaZIzpgwntfvd/v19NtA7f8JFANdFQOmeEen0lO bbZK0scK1mSsbYugdzeKlZIID9Ytim0SGclsoLQg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726901AbgCQLUg (ORCPT ); Tue, 17 Mar 2020 07:20:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:39520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727219AbgCQLAV (ORCPT ); Tue, 17 Mar 2020 07:00:21 -0400 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 05EEC20735; Tue, 17 Mar 2020 11:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584442821; bh=6RgVC7PG6F38PUNRjg8qI+Jf2B32drE7YGtE2f8ELfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IMVGwd/S92NBbtDyUleVINeCdy3CPdcg0ARjCnGuEAy8OX4aKlKQa9zHDpjHnPtqi aj9DYCp4LOZS5Hl7C6OuID0Z1A+++yhHyzXLYdo8r317isUUGlGra8UI0b+6N5Ifdb 4C7FmlXOBk8EucILWuitsVVuC46vmT/NF137RZsI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hamish Martin , Linus Walleij , Wolfram Sang Subject: [PATCH 4.19 74/89] i2c: gpio: suppress error on probe defer Date: Tue, 17 Mar 2020 11:55:23 +0100 Message-Id: <20200317103308.463712953@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103259.744774526@linuxfoundation.org> References: <20200317103259.744774526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hamish Martin commit 3747cd2efe7ecb9604972285ab3f60c96cb753a8 upstream. If a GPIO we are trying to use is not available and we are deferring the probe, don't output an error message. This seems to have been the intent of commit 05c74778858d ("i2c: gpio: Add support for named gpios in DT") but the error was still output due to not checking the updated 'retdesc'. Fixes: 05c74778858d ("i2c: gpio: Add support for named gpios in DT") Signed-off-by: Hamish Martin Acked-by: Linus Walleij Signed-off-by: Wolfram Sang Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -248,7 +248,7 @@ static struct gpio_desc *i2c_gpio_get_de if (ret == -ENOENT) retdesc = ERR_PTR(-EPROBE_DEFER); - if (ret != -EPROBE_DEFER) + if (PTR_ERR(retdesc) != -EPROBE_DEFER) dev_err(dev, "error trying to get descriptor: %d\n", ret); return retdesc;