diff options
| author | Kyle Manna <kyle@kylemanna.com> | 2011-08-11 22:33:12 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:14:11 -0800 |
| commit | 3ad5a4fbba0c5c863b0a42e2a6a5007de76d3102 (patch) | |
| tree | 9f1c3a12fbbffc72c413d2025fbaaffe774b523e /drivers/mfd | |
| parent | 4838b7e04451e425895c77f462ae1a70d6d3ff62 (diff) | |
| download | kernel_samsung_smdk4412-3ad5a4fbba0c5c863b0a42e2a6a5007de76d3102.zip kernel_samsung_smdk4412-3ad5a4fbba0c5c863b0a42e2a6a5007de76d3102.tar.gz kernel_samsung_smdk4412-3ad5a4fbba0c5c863b0a42e2a6a5007de76d3102.tar.bz2 | |
mfd: Copy the device pointer to the twl4030-madc structure
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>
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 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 |