From patchwork Thu Jan 10 20:29:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 1962051 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 77686DF264 for ; Thu, 10 Jan 2013 20:29:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755340Ab3AJU3d (ORCPT ); Thu, 10 Jan 2013 15:29:33 -0500 Received: from londo.lunn.ch ([80.238.139.98]:43253 "EHLO londo.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755309Ab3AJU3d (ORCPT ); Thu, 10 Jan 2013 15:29:33 -0500 Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian)) id 1TtOkc-00028I-00; Thu, 10 Jan 2013 21:29:22 +0100 From: Andrew Lunn To: Jason Cooper Cc: linux ARM , Thomas Petazzoni , cjb@laptop.org, linux-mmc@vger.kernel.org, Andrew Lunn Subject: [PATCH] mmc: mvsdio: Replace IS_ERR_NULL() is with IS_ERR() Date: Thu, 10 Jan 2013 21:29:15 +0100 Message-Id: <1357849755-8168-1-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org A NULL is a valid clk cookie, so we should not be tested with IS_ERR_NULL(). Replace it with IS_ERR(). Signed-off-by: Andrew Lunn Acked-by: Jason Cooper --- drivers/mmc/host/mvsdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index de4c20b..d0050fa 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -839,7 +839,7 @@ out: if (r) release_resource(r); if (mmc) - if (!IS_ERR_OR_NULL(host->clk)) { + if (!IS_ERR(host->clk)) { clk_disable_unprepare(host->clk); clk_put(host->clk); }