From patchwork Thu Apr 26 08:53:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10365015 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75506602DC for ; Thu, 26 Apr 2018 08:54:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65B6C2907F for ; Thu, 26 Apr 2018 08:54:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57E582908D; Thu, 26 Apr 2018 08:54:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D61E42907F for ; Thu, 26 Apr 2018 08:54:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754276AbeDZIyi (ORCPT ); Thu, 26 Apr 2018 04:54:38 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:44319 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754775AbeDZIxb (ORCPT ); Thu, 26 Apr 2018 04:53:31 -0400 Received: by mail-lf0-f68.google.com with SMTP id h197-v6so2141572lfg.11 for ; Thu, 26 Apr 2018 01:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4qRjfjcsNTisdPc2jK1jipH7JeqOKH7dML3l+Hiob5c=; b=Cr+cY3A453fhyYe6SnBd+HXPJoxr1ZAjXPrKlbWCjDFHpolEbfuqV5Z6yBE9OMYpAX AaDJWruyyCIxaJxD5ncc2uOo2j6y1DpgQ6DW+7FSffZHIzs3y7haaCEke+K9Gfp+1uio gTAQx3zWR9bNEIEIrRCfMz+n3K1JMKg1WX3r4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4qRjfjcsNTisdPc2jK1jipH7JeqOKH7dML3l+Hiob5c=; b=LH5xYRYnZJoK+f5UKg7jIXTJGLeg79/e0Wr+5gqoEtNS8O6MXJjDjIPFrGD1dI377W 5NYpuOHGABE3hzW4cIqti59+6hJ4I4kdZDE+eKzh2QwNFmZtGNFyPkVSBum2dbpXfAcZ tL1hckQ+IJDfRNLVt6lChI39mowl91D/JQ47kkluwLZGDa798RD0y94o2UdqE0T/4Jln m3MbZMocDeSCSF9XPc0TxNINcvQE8pIz97KU2Ow0sjk5qaCbEkZ0IU+JtI1Ly1Y28Gpm TmCTBpbrLFrIFn14TiVprfJ/2+I5VVjfU9kZQzdB6VxWq/bwkfBnwAoCf+ephRz6EL/T hsQg== X-Gm-Message-State: ALQs6tAc6fgwhXDmB37KAitRrykda4CWodHs4MVNnOThIyoqfBUFYUy6 sVoNc3OriFrL16SmZG642AlYxw== X-Google-Smtp-Source: AB8JxZr0FO6Dc/su+Yv7xk87b2fh/iPmzRVQyBUX/0+XYx44xeHrK+u+tntfi29r1fL+O9Zg15yaOg== X-Received: by 2002:a19:8f06:: with SMTP id r6-v6mr17093851lfd.56.1524732810431; Thu, 26 Apr 2018 01:53:30 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id u83-v6sm681097lff.65.2018.04.26.01.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 01:53:29 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , linux-pm@vger.kernel.org Cc: Ulf Hansson , Kevin Hilman , Geert Uytterhoeven , Viresh Kumar , Vincent Guittot , Mark Brown , Vinod Koul , Sanyog Kale , Pierre-Louis Bossart , Wolfram Sang , Russell King , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/11] spi: Respect all error codes from dev_pm_domain_attach() Date: Thu, 26 Apr 2018 10:53:10 +0200 Message-Id: <1524732790-2234-12-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524732790-2234-1-git-send-email-ulf.hansson@linaro.org> References: <1524732790-2234-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The limitation of being able to check only for -EPROBE_DEFER from dev_pm_domain_attach() has been removed. Hence let's respect all error codes and bail out accordingly. Cc: Mark Brown Signed-off-by: Ulf Hansson Acked-by: Mark Brown --- drivers/spi/spi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 7b213fa..eeab67f 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -356,11 +356,12 @@ static int spi_drv_probe(struct device *dev) } ret = dev_pm_domain_attach(dev, true); - if (ret != -EPROBE_DEFER) { - ret = sdrv->probe(spi); - if (ret) - dev_pm_domain_detach(dev, true); - } + if (ret) + return ret; + + ret = sdrv->probe(spi); + if (ret) + dev_pm_domain_detach(dev, true); return ret; }