From patchwork Wed Sep 19 02:12:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1475631 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CAB4D400EC for ; Wed, 19 Sep 2012 02:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754981Ab2ISCSa (ORCPT ); Tue, 18 Sep 2012 22:18:30 -0400 Received: from na3sys009aog119.obsmtp.com ([74.125.149.246]:40568 "EHLO na3sys009aog119.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754410Ab2ISCSa (ORCPT ); Tue, 18 Sep 2012 22:18:30 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob119.postini.com ([74.125.148.12]) with SMTP ID DSNKUFkrcuoyD5UQEmbwQNZIo14VnxAGj72e@postini.com; Tue, 18 Sep 2012 19:18:29 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 18 Sep 2012 19:18:12 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id 8134A4E510; Tue, 18 Sep 2012 19:18:11 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com, kliu5@marvell.com, Bin Wang Subject: [PATCH 6/6] mmc: sdhci: fix null return check of regulator_get Date: Wed, 19 Sep 2012 10:12:42 +0800 Message-Id: <1348020762-12932-7-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1348020762-12932-1-git-send-email-keyuan.liu@gmail.com> References: <1348020762-12932-1-git-send-email-keyuan.liu@gmail.com> X-OriginalArrivalTime: 19 Sep 2012 02:18:12.0794 (UTC) FILETIME=[0519F1A0:01CD960D] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu regulator_get() returns NULL when CONFIG_REGULATOR not defined, which should be checked. Signed-off-by: Bin Wang Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4b5631e..914147d 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2845,7 +2845,7 @@ int sdhci_add_host(struct sdhci_host *host) /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc"); - if (IS_ERR(host->vqmmc)) { + if (IS_ERR_OR_NULL(host->vqmmc)) { pr_info("%s: no vqmmc regulator found\n", mmc_hostname(mmc)); host->vqmmc = NULL; } @@ -2912,7 +2912,7 @@ int sdhci_add_host(struct sdhci_host *host) ocr_avail = 0; host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); - if (IS_ERR(host->vmmc)) { + if (IS_ERR_OR_NULL(host->vmmc)) { pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc)); host->vmmc = NULL; } else