This is a note to let you know that I've just added the patch titled
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
watchdog-fix-null-pointer-dereference-while-accessing-rdc321x-platform_data.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 3b3c1f24e96c411a95daabb6af9e09c5381f713b Mon Sep 17 00:00:00 2001
From: Florian Fainelli <[email protected]>
Date: Fri, 26 Nov 2010 10:39:55 +0100
Subject: watchdog: Fix null pointer dereference while accessing rdc321x
platform_data
From: Florian Fainelli <[email protected]>
commit 3b3c1f24e96c411a95daabb6af9e09c5381f713b upstream.
rdc321x-wdt currently fetches its driver specific data by using the
platform_device->platform_data pointer, this is wrong because the mfd
device which registers our platform_device has been added using
mfd_add_device() which sets the platform_device->driver_data pointer
instead.
Signed-off-by: Florian Fainelli <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/watchdog/rdc321x_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -231,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(s
struct resource *r;
struct rdc321x_wdt_pdata *pdata;
- pdata = pdev->dev.platform_data;
+ pdata = platform_get_drvdata(pdev);
if (!pdata) {
dev_err(&pdev->dev, "no platform data supplied\n");
return -ENODEV;
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/gpio-fix-null-pointer-dereference-while-accessing-rdc321x-platform_data.patch
queue-2.6.36/watchdog-fix-null-pointer-dereference-while-accessing-rdc321x-platform_data.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
