From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754542AbbEMItR (ORCPT ); Wed, 13 May 2015 04:49:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59725 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752022AbbEMItL (ORCPT ); Wed, 13 May 2015 04:49:11 -0400 Date: Wed, 13 May 2015 01:48:55 -0700 From: tip-bot for Axel Lin Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, axel.lin@ingics.com, sboyd@codeaurora.org Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, sboyd@codeaurora.org, axel.lin@ingics.com In-Reply-To: <1431334978.17783.4.camel@ingics.com> References: <1431334978.17783.4.camel@ingics.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: devres: Fix testing return value of request_any_context_irq() Git-Commit-ID: 63781394c540dd9e666a6b21d70b64dd52bce76e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 63781394c540dd9e666a6b21d70b64dd52bce76e Gitweb: http://git.kernel.org/tip/63781394c540dd9e666a6b21d70b64dd52bce76e Author: Axel Lin AuthorDate: Mon, 11 May 2015 17:02:58 +0800 Committer: Thomas Gleixner CommitDate: Wed, 13 May 2015 10:47:37 +0200 genirq: devres: Fix testing return value of request_any_context_irq() request_any_context_irq() returns a negative value on failure. It returns either IRQC_IS_HARDIRQ or IRQC_IS_NESTED on success. So fix testing return value of request_any_context_irq(). Also fixup the return value of devm_request_any_context_irq() to make it consistent with request_any_context_irq(). Fixes: 0668d3065128 ("genirq: Add devm_request_any_context_irq()") Signed-off-by: Axel Lin Reviewed-by: Stephen Boyd Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1431334978.17783.4.camel@ingics.com Signed-off-by: Thomas Gleixner --- kernel/irq/devres.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index d5d0f73..74d90a7 100644 --- a/kernel/irq/devres.c +++ b/kernel/irq/devres.c @@ -104,7 +104,7 @@ int devm_request_any_context_irq(struct device *dev, unsigned int irq, return -ENOMEM; rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id); - if (rc) { + if (rc < 0) { devres_free(dr); return rc; } @@ -113,7 +113,7 @@ int devm_request_any_context_irq(struct device *dev, unsigned int irq, dr->dev_id = dev_id; devres_add(dev, dr); - return 0; + return rc; } EXPORT_SYMBOL(devm_request_any_context_irq);