aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/jz4740-battery.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-11-11 13:00:53 -0500
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-11-18 08:56:22 -0500
commit8477cedb49c69ce64b603d76c7776811eec0f9d7 (patch)
tree88528e5766e5c7434aa7d39ac5f631d1798b7b75 /drivers/power/jz4740-battery.c
parente1a85694e08d03efae9e08fdb292dfd4870837bc (diff)
jz4740-battery: Check if platform_data is supplied
Currently platform_data is dereferenced without checking whether it is actually set, which can lead to kernel crashes. This patch adds a check which will abort the drivers probe function gracefully if no platform_data is supplied. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power/jz4740-battery.c')
-rw-r--r--drivers/power/jz4740-battery.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 2bbe04ae13a7..5b4821593201 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -246,6 +246,11 @@ static int __devinit jz_battery_probe(struct platform_device *pdev)
246 struct jz_battery *jz_battery; 246 struct jz_battery *jz_battery;
247 struct power_supply *battery; 247 struct power_supply *battery;
248 248
249 if (!pdata) {
250 dev_err(&pdev->dev, "No platform_data supplied\n");
251 return -ENXIO;
252 }
253
249 jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL); 254 jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL);
250 if (!jz_battery) { 255 if (!jz_battery) {
251 dev_err(&pdev->dev, "Failed to allocate driver structure\n"); 256 dev_err(&pdev->dev, "Failed to allocate driver structure\n");