From 4bc0a9656f2bf0c70ff95a59eeef4b7eb0ba3d26 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 1 Feb 2012 16:12:22 +0530 Subject: [PATCH] --- yaml --- r: 297500 b: refs/heads/master c: 6c618c9de5f2b4b43c30c6203869620bec6ed929 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d15b99df5b61..67465d2be3d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8d9f875c9b02bb56ba3bb44834ae81ba0e8efbc +refs/heads/master: 6c618c9de5f2b4b43c30c6203869620bec6ed929 diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index 157739423734..f3aecb3c0343 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -1369,7 +1369,7 @@ static int __init dw_probe(struct platform_device *pdev) int err; int i; - pdata = pdev->dev.platform_data; + pdata = dev_get_platdata(&pdev->dev); if (!pdata || pdata->nr_channels > DW_DMA_MAX_NR_CHANNELS) return -EINVAL;