projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
extcon
/
extcon-max8997.c
diff --git
a/drivers/extcon/extcon-max8997.c
b/drivers/extcon/extcon-max8997.c
index 67d6738d85a00d514d3d4c6692e969331663abde..09f4a9374cf53d11b0066ef2eefc923a6883df13 100644
(file)
--- 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;