From patchwork Tue Apr 17 09:24:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 153100 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C8333B7000 for ; Tue, 17 Apr 2012 19:38:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932075Ab2DQJi1 (ORCPT ); Tue, 17 Apr 2012 05:38:27 -0400 Received: from eu1sys200aog114.obsmtp.com ([207.126.144.137]:33352 "EHLO eu1sys200aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932070Ab2DQJi1 (ORCPT ); Tue, 17 Apr 2012 05:38:27 -0400 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKT406DPMbT3ZYxe808yEd4emKxMFkMaxC@postini.com; Tue, 17 Apr 2012 09:38:26 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id D8A5C150; Tue, 17 Apr 2012 09:29:54 +0000 (GMT) Received: from Webmail-ap.st.com (eapex1hubcas4.st.com [10.80.176.69]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id C2E1EC4C; Tue, 17 Apr 2012 09:38:15 +0000 (GMT) Received: from localhost (10.199.82.50) by Webmail-ap.st.com (10.80.176.7) with Microsoft SMTP Server (TLS) id 8.3.192.1; Tue, 17 Apr 2012 17:36:48 +0800 From: Viresh Kumar To: Cc: , , , , Viresh Kumar Subject: [PATCH] stmmac: fix kernel crash when device probed for SPEAr with DT Date: Tue, 17 Apr 2012 14:54:00 +0530 Message-ID: <91ea900ce78bb2054d83e0575c16ac70f3f11511.1334654597.git.viresh.kumar@st.com> X-Mailer: git-send-email 1.7.9 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org plat->dma_cfg is never allocated memory and is tried to be filled when we boot it for SPEAr SoCs with DT. And so get a kernel crash. Fix it by allocating memory for dma_cfg. Signed-off-by: Viresh Kumar --- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 12bd221..f124f60 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -110,6 +110,14 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) goto out_unmap; } + plat_dat->dma_cfg = devm_kzalloc(&pdev->dev, + sizeof(*plat_dat->dma_cfg), GFP_KERNEL); + if (!plat_dat->dma_cfg) { + pr_err("%s: ERROR: no memory for dma_cfg", __func__); + ret = -ENOMEM; + goto out_unmap; + } + ret = stmmac_probe_config_dt(pdev, plat_dat, &mac); if (ret) { pr_err("%s: main dt probe failed", __func__);