From patchwork Mon Feb 3 14:54:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B8rensen=2C_Stefan?= X-Patchwork-Id: 316166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 264542C0079 for ; Tue, 4 Feb 2014 01:55:10 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAKvB-000398-EX; Mon, 03 Feb 2014 14:54:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAKv7-0002w7-Th; Mon, 03 Feb 2014 14:54:45 +0000 Received: from 213083164162.static.sonofon.dk ([213.83.164.162] helo=HORWDSPRD01.spectralink.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAKv0-0002uO-HB for linux-mtd@lists.infradead.org; Mon, 03 Feb 2014 14:54:40 +0000 Received: from e37108.spectralink.com ([172.29.194.63]) by HORWDSPRD01.spectralink.com with Microsoft SMTPSVC(7.5.7600.16601); Mon, 3 Feb 2014 15:54:11 +0100 Received: by e37108.spectralink.com (sSMTP sendmail emulation); Mon, 03 Feb 2014 15:54:11 +0100 From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= To: dwmw2@infradead.org, computersforpeace@gmail.com, avinashphilip@ti.com, linux-mtd@lists.infradead.org Subject: [PATCH] mtd:elm: Use correct check on return value of pm_runtime_get_sync Date: Mon, 3 Feb 2014 15:54:09 +0100 Message-Id: <1391439249-23078-1-git-send-email-stefan.sorensen@spectralink.com> X-Mailer: git-send-email 1.8.5.3 MIME-Version: 1.0 X-OriginalArrivalTime: 03 Feb 2014 14:54:11.0609 (UTC) FILETIME=[CC6E5890:01CF20EF] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140203_095438_806352_321D8CB6 X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: =?UTF-8?q?Stefan=20S=C3=B8rensen?= X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The ELM driver incorrectly reagard any non-zero return value from pm_runtime_get_sync as an error, but it may return 1 if the device was already active. Fix to only error when return value is negative. Signed-off-by: Stefan Sørensen --- drivers/mtd/devices/elm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/devices/elm.c b/drivers/mtd/devices/elm.c index d1dd6a3..e2c073c 100644 --- a/drivers/mtd/devices/elm.c +++ b/drivers/mtd/devices/elm.c @@ -380,7 +380,7 @@ static int elm_probe(struct platform_device *pdev) } pm_runtime_enable(&pdev->dev); - if (pm_runtime_get_sync(&pdev->dev)) { + if (pm_runtime_get_sync(&pdev->dev) < 0) { ret = -EINVAL; pm_runtime_disable(&pdev->dev); dev_err(&pdev->dev, "can't enable clock\n");