From patchwork Thu Apr 10 14:19:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 338135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C197A14007E for ; Fri, 11 Apr 2014 00:19:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934688AbaDJOTp (ORCPT ); Thu, 10 Apr 2014 10:19:45 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:40033 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934295AbaDJOTp (ORCPT ); Thu, 10 Apr 2014 10:19:45 -0400 Received: by mail-wg0-f41.google.com with SMTP id n12so4056134wgh.12 for ; Thu, 10 Apr 2014 07:19:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZqUi6QQCmLaMQATGe8Q5pJXZyiacM/gJ4w5QHc54cZA=; b=IR6nGtizcbvcNyiPd2oCtU/NBLzoxqdlpNlA31uJryGUaIK2LuRrXnARQmd0lIf7BX FxvfOcS8FO5xCp01FCmjFKmvkCvVqysShl868ManpJb5beAlmRTTguJ40iFxfa/fDKlY g+8zFdgkKwqrzlxvWNuehIF/cFLWVmOi1jOHqXGyRg0+SMgC/p0FZd32eOm5gnoGkqfP IEZkWdP0c8PHr05o+mvzn90fWGXzRKbS5MBrdlqkLyd8o6xFneMb5kO/MktTLZxdcy3W VfJgzH5xDPdvMvDyzJk2YjR6/Nd5O32KgCvSmdyWSSsG1TuSYeAAhIrLldW0fPjsqvbR DPiQ== X-Gm-Message-State: ALoCoQkCPTp7gWGPjXn9BTCHEKNYbadDqCHw2869/mmPsnkkb2Ar4E6j3s2PaR/LQCOfg28xpyaL X-Received: by 10.194.20.229 with SMTP id q5mr472819wje.86.1397139583839; Thu, 10 Apr 2014 07:19:43 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id s3sm6771102wje.36.2014.04.10.07.19.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 07:19:43 -0700 (PDT) From: Ulf Hansson To: Wolfram Sang , linux-i2c@vger.kernel.org Cc: Linus Walleij , Alessandro Rubini , linux-arm-kernel@lists.infradead.org, Ulf Hansson Subject: [PATCH] i2c: nomadik: Don't use IS_ERR for devm_ioremap Date: Thu, 10 Apr 2014 16:19:29 +0200 Message-Id: <1397139569-3906-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org devm_ioremap() returns NULL on error, not an error. Cc: Alessandro Rubini Cc: Linus Walleij Signed-off-by: Ulf Hansson Acked-by: Linus Walleij --- drivers/i2c/busses/i2c-nomadik.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 28cbe1b..32c85e9 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -999,7 +999,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) dev->virtbase = devm_ioremap(&adev->dev, adev->res.start, resource_size(&adev->res)); - if (IS_ERR(dev->virtbase)) { + if (!dev->virtbase) { ret = -ENOMEM; goto err_no_mem; }