From 5e423952dd01e443fb46685adc0d7f1d5561106c Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 1 Jun 2011 13:05:10 +0300 Subject: [PATCH] --- yaml --- r: 260685 b: refs/heads/master c: 6c44863763254eaf96ec7d4f816fb88605301e76 h: refs/heads/master i: 260683: af13832af710d01f40e6f451b5d107712694140c v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl6040-core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5e9acbc34c13..b0a424baf0d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb34d3d5056a1f8439bbfa13d4519345814d4255 +refs/heads/master: 6c44863763254eaf96ec7d4f816fb88605301e76 diff --git a/trunk/drivers/mfd/twl6040-core.c b/trunk/drivers/mfd/twl6040-core.c index 57ae36bae807..cfaedb5581ad 100644 --- a/trunk/drivers/mfd/twl6040-core.c +++ b/trunk/drivers/mfd/twl6040-core.c @@ -501,9 +501,8 @@ static int __devinit twl6040_probe(struct platform_device *pdev) if (pdata->codec) { cell = &twl6040->cells[children]; cell->name = "twl6040-codec"; - /* The codec expects the twl4030_audio_data as platform data */ - cell->platform_data = pdata; - cell->pdata_size = sizeof(*pdata); + cell->platform_data = pdata->codec; + cell->pdata_size = sizeof(*pdata->codec); children++; }