diff options
| author | Kyle Manna <kyle@kylemanna.com> | 2011-08-11 23:33:12 -0400 |
|---|---|---|
| committer | Brad Figg <brad.figg@canonical.com> | 2012-01-23 18:36:16 -0500 |
| commit | a750bb85194971c2b0cd212f4f840d762cadb594 (patch) | |
| tree | 1d2c309997711511dd30d8ba8f8571fc557cbd10 /drivers/mfd | |
| parent | 8eab48e1d39755d93676fdc17e7e288afbe02178 (diff) | |
mfd: Copy the device pointer to the twl4030-madc structure
BugLink: http://bugs.launchpad.net/bugs/913373
commit 66cc5b8e50af87b0bbd0f179d76d2826f4549c13 upstream.
Worst case this fixes the following error:
[ 72.086212] (NULL device *): conversion timeout!
Best case it prevents a crash
Signed-off-by: Kyle Manna <kyle@kylemanna.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-madc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c index b5d598c3aa7..cb44b53dee3 100644 --- a/drivers/mfd/twl4030-madc.c +++ b/drivers/mfd/twl4030-madc.c | |||
| @@ -706,6 +706,8 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev) | |||
| 706 | if (!madc) | 706 | if (!madc) |
| 707 | return -ENOMEM; | 707 | return -ENOMEM; |
| 708 | 708 | ||
| 709 | madc->dev = &pdev->dev; | ||
| 710 | |||
| 709 | /* | 711 | /* |
| 710 | * Phoenix provides 2 interrupt lines. The first one is connected to | 712 | * Phoenix provides 2 interrupt lines. The first one is connected to |
| 711 | * the OMAP. The other one can be connected to the other processor such | 713 | * the OMAP. The other one can be connected to the other processor such |