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
/
leds
/
leds-lp8501.c
diff --git
a/kernel/drivers/leds/leds-lp8501.c
b/kernel/drivers/leds/leds-lp8501.c
index
d3098e3
..
3f54f6f
100644
(file)
--- a/
kernel/drivers/leds/leds-lp8501.c
+++ b/
kernel/drivers/leds/leds-lp8501.c
@@
-308,20
+308,19
@@
static int lp8501_probe(struct i2c_client *client,
int ret;
struct lp55xx_chip *chip;
struct lp55xx_led *led;
int ret;
struct lp55xx_chip *chip;
struct lp55xx_led *led;
- struct lp55xx_platform_data *pdata;
+ struct lp55xx_platform_data *pdata
= dev_get_platdata(&client->dev)
;
struct device_node *np = client->dev.of_node;
struct device_node *np = client->dev.of_node;
- if (!
dev_get_platdata(&client->dev)
) {
+ if (!
pdata
) {
if (np) {
if (np) {
-
ret
= lp55xx_of_populate_pdata(&client->dev, np);
- if (
ret < 0
)
- return
ret
;
+
pdata
= lp55xx_of_populate_pdata(&client->dev, np);
+ if (
IS_ERR(pdata)
)
+ return
PTR_ERR(pdata)
;
} else {
dev_err(&client->dev, "no platform data\n");
return -EINVAL;
}
}
} else {
dev_err(&client->dev, "no platform data\n");
return -EINVAL;
}
}
- pdata = dev_get_platdata(&client->dev);
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)