[3.11.y.z extended stable] Patch "extcon: max8997: Fix NULL pointer exception on missing pdata" has been added to staging queue
Luis Henriques
luis.henriques at canonical.com
Thu Jun 26 10:34:01 UTC 2014
This is a note to let you know that I have just added a patch titled
extcon: max8997: Fix NULL pointer exception on missing pdata
to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From 4f8ae0f14eb159b167c3539e0d072fbfbe0febcb Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <k.kozlowski at samsung.com>
Date: Wed, 9 Apr 2014 15:20:14 +0200
Subject: extcon: max8997: Fix NULL pointer exception on missing pdata
commit dfee4111febf3d9ef3a640b2cd6205c75f4e7e3d upstream.
Fix NULL pointer exception when platform data is not supplied. The
driver dereferenced pdata pointer where it could be NULL.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski at samsung.com>
Fixes: 810d601f07c
Signed-off-by: Chanwoo Choi <cw00.choi at samsung.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/extcon/extcon-max8997.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 67d6738d85a0..09f4a9374cf5 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -712,7 +712,7 @@ static int max8997_muic_probe(struct platform_device *pdev)
goto err_irq;
}
- if (pdata->muic_pdata) {
+ if (pdata && pdata->muic_pdata) {
struct max8997_muic_platform_data *muic_pdata
= pdata->muic_pdata;
--
1.9.1
More information about the kernel-team
mailing list