mfd: Copy the device pointer to the twl4030-madc structure
authorKyle Manna <kyle@kylemanna.com>
Fri, 12 Aug 2011 03:33:12 +0000 (22:33 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2012 22:14:11 +0000 (14:14 -0800)
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>
drivers/mfd/twl4030-madc.c

index b5d598c3aa71b356f40fb9a5f89738eed16c5350..cb44b53dee3573a4a16ff38503e25b08b4ce83b5 100644 (file)
@@ -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