From patchwork Tue Jun 10 18:49:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 4330151 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 27EDBBEEAA for ; Tue, 10 Jun 2014 18:49:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17EB820295 for ; Tue, 10 Jun 2014 18:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CCDB201BB for ; Tue, 10 Jun 2014 18:49:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751140AbaFJStK (ORCPT ); Tue, 10 Jun 2014 14:49:10 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:60681 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbaFJStJ (ORCPT ); Tue, 10 Jun 2014 14:49:09 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id E806B13F497; Tue, 10 Jun 2014 18:49:08 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id D8B9D13F4C1; Tue, 10 Jun 2014 18:49:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from galak-ubuntu.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: galak@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7823C13EDF1; Tue, 10 Jun 2014 18:49:07 +0000 (UTC) From: Kumar Gala To: Chris Ball , Ulf Hansson Cc: Kumar Gala , linux-mmc@vger.kernel.org, rmk+kernel@arm.linux.org.uk, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mmc: sdhci-msm: Fix crash due to missing ops functions Date: Tue, 10 Jun 2014 13:49:05 -0500 Message-Id: <1402426145-11180-1-git-send-email-galak@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Recent changes in sdhci core need to get reflected in sdhci_msm_ops otherwise we ended up dereferencing null pointers in the ops struct and crash. Signed-off-by: Kumar Gala --- drivers/mmc/host/sdhci-msm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index acb0e9e..0d6cee0 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -467,7 +467,11 @@ static const struct of_device_id sdhci_msm_dt_match[] = { MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); static struct sdhci_ops sdhci_msm_ops = { + .set_clock = sdhci_set_clock, + .set_bus_width = sdhci_set_bus_width, .platform_execute_tuning = sdhci_msm_execute_tuning, + .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static int sdhci_msm_probe(struct platform_device *pdev)