Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
mfd
/
wm831x-core.c
diff --git
a/kernel/drivers/mfd/wm831x-core.c
b/kernel/drivers/mfd/wm831x-core.c
index
28366a9
..
3e0e99e
100644
(file)
--- a/
kernel/drivers/mfd/wm831x-core.c
+++ b/
kernel/drivers/mfd/wm831x-core.c
@@
-1626,7
+1626,9
@@
int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
mutex_init(&wm831x->io_lock);
mutex_init(&wm831x->key_lock);
dev_set_drvdata(wm831x->dev, wm831x);
mutex_init(&wm831x->io_lock);
mutex_init(&wm831x->key_lock);
dev_set_drvdata(wm831x->dev, wm831x);
- wm831x->soft_shutdown = pdata->soft_shutdown;
+
+ if (pdata)
+ wm831x->soft_shutdown = pdata->soft_shutdown;
ret = wm831x_reg_read(wm831x, WM831X_PARENT_ID);
if (ret < 0) {
ret = wm831x_reg_read(wm831x, WM831X_PARENT_ID);
if (ret < 0) {