From patchwork Sun Aug 6 15:14:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 9883811 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 03EF860360 for ; Sun, 6 Aug 2017 15:18:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7D4B285E6 for ; Sun, 6 Aug 2017 15:18:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBFC8285ED; Sun, 6 Aug 2017 15:18:41 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6807B285E6 for ; Sun, 6 Aug 2017 15:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Subject:To:Date:Message-Id :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=EgUQFw3yWAvRL20jF0bdCtd7Xy7Lyrd0Fg/YMJxbHnM=; b=reKeZeAOVeqQSv E5TDanDolviiCI5LhcToOPPmLXMRrWefBQyF3P8RY+4MxXLEnMDEO0uMQHLnAV4H4r9C7hFSknAou BwW/f74iplsv0TMyj8/I5tDlwL1Q+vsKiKrz8vjuMeU0FW9OfskAFtFOymZLUJQ0hfDU4wZCf/rFb 0dFXB3AAM4q5iDNfYGyHneqMRsKjTXI2Q6IreJjADhu39Pz+0CG/6c6KYaHYBTuwvW+GatvaKVY3T JAeoXWTcI6qxfo3x5NESMrSi4KFrOufL6+MoBuG4l6IeEQJbIQEXMEJPy64ivs7tilrtVoazVrQXe SoYLCAqwYynb3xkCFD9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1deNJl-0000P4-UJ; Sun, 06 Aug 2017 15:18:13 +0000 Received: from mail-lf0-x22c.google.com ([2a00:1450:4010:c07::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1deNJD-00089F-Sw for linux-arm-kernel@lists.infradead.org; Sun, 06 Aug 2017 15:17:46 +0000 Received: by mail-lf0-x22c.google.com with SMTP id g25so21879983lfh.1 for ; Sun, 06 Aug 2017 08:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:user-agent:date:to:cc:subject:mime-version :content-disposition; bh=wgR+1CJ5B8ywhmaVrfg5ee+p0pk9m02vX93IZKt4UUY=; b=hBsQx0b1Jt1rDZLVCKgDw1uAIPZh9TQAjoj6pt0Cy1EDR305KqI9F5EPIS8QkvCV2H dYj4M5nDSnqhp7eJVFH7ONAjMiwurDo1LyITTpcGJorVZI7Y8goVk00M/YkXfaxKPFvy ACDa1F9ko16dvBVJyqJu+cCq+h0PptkZVrFqFb9jgmdkhxNw72P6L2n1psu1vX6f3nzR g7NZPLafT1Jn3hVSmf2WheM01KSHR8OMMdLYKHU84vw68iNJH8kibJy0S2azMhIMjL2Z aVVqJic/BTVDndM3vcsPYvitmBjmCqSA6vhagjSE5/miIeGRSIn+cMKKB2pESEPDTV6H LslQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:user-agent:date:to:cc:subject :mime-version:content-disposition; bh=wgR+1CJ5B8ywhmaVrfg5ee+p0pk9m02vX93IZKt4UUY=; b=Vk7dhGxyGCA9LP/1ibPD45MPg9DrDPAy09vdw9i+r9zoN6+eIlnYFX3HPnC3Ix+Nk0 r4rZrEmG3b25ALACsUt3P+qiXS+IiiGYhIAMshWiwknKWed8dy7JhtjGNIggF/LhKq75 gTLeq6RaosKe2MkwBYlK+aMNhUZneINEEujLLcT0MYVR1Vf+/zN2+DNwL/ejDvhhyv2A i8gZ8EIw27OaAgFjsoY7Q6C/N7rs0rGwOpnL2iXkt4vtkVAZr/BVCv+B5WlJ8QIY2Lkx CCjMdzjo8sQ4FES80zkkPlwsxeIAGpe5iec/l/ml4ZxhVMq3+tG9QWP+QBU9ataj+w43 tsgA== X-Gm-Message-State: AHYfb5h2eCiHJf9pENL7djOWana2tDbzmHWiKVfOfLS2sDMcCBdV8w8W PmucKovBpoc8YCWX X-Received: by 10.25.125.5 with SMTP id y5mr2201518lfc.135.1502032637969; Sun, 06 Aug 2017 08:17:17 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.122]) by smtp.gmail.com with ESMTPSA id n103sm1851126lfi.57.2017.08.06.08.17.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Aug 2017 08:17:16 -0700 (PDT) From: Sergei Shtylyov X-Google-Original-From: "Sergei Shtylyov" Received: by wasted.cogentembedded.com (sSMTP sendmail emulation); Sun, 06 Aug 2017 18:17:14 +0300 Message-Id: <20170806151714.108596802@cogentembedded.com> User-Agent: quilt/0.64 Date: Sun, 06 Aug 2017 18:14:22 +0300 To: Rajendra Nayak , Paul Walmsley , Tony Lindgren , linux-omap@vger.kernel.org Subject: [PATCH v2 2/2] ARM: OMAP4+: PRM: fix of_irq_get() result checks MIME-Version: 1.0 Content-Disposition: inline; filename=ARM-OMAP4-PRM-fix-of_irq_get-result-checks-v2.patch X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170806_081740_623853_E1AED8F7 X-CRM114-Status: GOOD ( 11.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Sergei Shtylyov , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP of_irq_get() may return 0 as well as a nagative error number on failure, (and never on success), however omap44xx_prm_late_init() regards 0 as a valid IRQ -- fix this. Fixes: a8f83aefcd5a ("ARM: OMAP4+: PRM: register interrupt information from DT") Fixes: c5b3955828ba ("ARM: OMAP4: Fix legacy code clean-up regression") Signed-off-by: Sergei Shtylyov --- Changes ion version 2: - added the "Fixes:" tag for the commit introducing of_irq_get() call; - rebased to the 'omap-for-v4.13/fixes' branch; - fixed Rajendra Nayak's email; - added + to OMAP4 in the patch subject. arch/arm/mach-omap2/prm44xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-omap/arch/arm/mach-omap2/prm44xx.c =================================================================== --- linux-omap.orig/arch/arm/mach-omap2/prm44xx.c +++ linux-omap/arch/arm/mach-omap2/prm44xx.c @@ -747,7 +747,7 @@ static int omap44xx_prm_late_init(void) * Already have OMAP4 IRQ num. For all other platforms, we need * IRQ numbers from DT */ - if (irq_num < 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) { + if (irq_num <= 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) { if (irq_num == -EPROBE_DEFER) return irq_num; @@ -756,7 +756,7 @@ static int omap44xx_prm_late_init(void) } /* Once OMAP4 DT is filled as well */ - if (irq_num >= 0) { + if (irq_num > 0) { omap4_prcm_irq_setup.irq = irq_num; omap4_prcm_irq_setup.xlate_irq = NULL; }