summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKyle Manna <kyle@kylemanna.com>2011-08-11 22:33:12 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-09-06 16:37:59 +0200
commit66cc5b8e50af87b0bbd0f179d76d2826f4549c13 (patch)
tree1984035e6b94e728709fecfeb525c66d590f6379 /drivers
parentaa9d842c5f2da6cdef2777f2f062f61898be89d3 (diff)
downloadop-kernel-dev-66cc5b8e50af87b0bbd0f179d76d2826f4549c13.zip
op-kernel-dev-66cc5b8e50af87b0bbd0f179d76d2826f4549c13.tar.gz
mfd: Copy the device pointer to the twl4030-madc structure
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/twl4030-madc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index b5d598c..cb44b53 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)
if (!madc)
return -ENOMEM;
+ madc->dev = &pdev->dev;
+
/*
* Phoenix provides 2 interrupt lines. The first one is connected to
* the OMAP. The other one can be connected to the other processor such
OpenPOWER on IntegriCloud