summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonghwan Choi <jhbird.choi@samsung.com>2011-11-01 01:11:09 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-01 01:30:53 +0100
commite58a0f89b25a2299374176d5c37aa89b326681e6 (patch)
treed68ea1bc15ac9684982d0023de277fc6901e77e3
parentlis3lv02d: make regulator API usage unconditional (diff)
downloadlinux-e58a0f89b25a2299374176d5c37aa89b326681e6.tar.xz
linux-e58a0f89b25a2299374176d5c37aa89b326681e6.zip
driver/misc/fsa9480.c fix potential null-pointer dereference
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> Cc: Donggeun Kim <dg77.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/misc/fsa9480.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/fsa9480.c b/drivers/misc/fsa9480.c
index 27dc0d21aafa..f6586d53e1a3 100644
--- a/drivers/misc/fsa9480.c
+++ b/drivers/misc/fsa9480.c
@@ -400,7 +400,8 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw)
return ret;
}
- device_init_wakeup(&client->dev, pdata->wakeup);
+ if (pdata)
+ device_init_wakeup(&client->dev, pdata->wakeup);
}
return 0;