X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fmfd%2Fwm831x-core.c;fp=kernel%2Fdrivers%2Fmfd%2Fwm831x-core.c;h=3e0e99ec5836dafa758468351b000e76ad6b7dae;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=28366a90e1adfbec14b5679244676b1077c9926e;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git diff --git a/kernel/drivers/mfd/wm831x-core.c b/kernel/drivers/mfd/wm831x-core.c index 28366a90e..3e0e99ec5 100644 --- 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); - 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) {