From patchwork Wed Oct 6 21:14:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Anders, David" X-Patchwork-Id: 237131 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o96LEkvP018276 for ; Wed, 6 Oct 2010 21:14:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933125Ab0JFVOs (ORCPT ); Wed, 6 Oct 2010 17:14:48 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:56750 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933101Ab0JFVOs (ORCPT ); Wed, 6 Oct 2010 17:14:48 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o96LEarK030285 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 6 Oct 2010 16:14:36 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o96LEaAM027599; Wed, 6 Oct 2010 16:14:36 -0500 (CDT) Received: from localhost (ccd-dev.am.dhcp.ti.com [128.247.77.58]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o96LEaf05766; Wed, 6 Oct 2010 16:14:36 -0500 (CDT) From: David Anders To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.arm.linux.org.uk Cc: David Anders , Anand Gadiyar Subject: [PATCH 2/4] omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set Date: Wed, 6 Oct 2010 16:14:31 -0500 Message-Id: <1286399673-912-3-git-send-email-x0132446@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1286399673-912-1-git-send-email-x0132446@ti.com> References: <1286399673-912-1-git-send-email-x0132446@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 21:14:49 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 093d13b..697c0bd 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -85,7 +85,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev) static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) { - struct omap_mmc_platform_data *pdata = dev->platform_data; + struct omap_mmc_platform_data *pdata; + + /* dev can be null if CONFIG_MMC_OMAP_HS is not set */ + if (!dev) { + pr_err("Failed omap4_twl6030_hsmmc_set_late_init\n"); + return; + } + pdata = dev->platform_data; pdata->init = omap4_twl6030_hsmmc_late_init; }