diff options
author | LABBE Corentin <clabbe.montjoie@gmail.com> | 2016-08-16 11:27:18 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-09-27 11:41:30 +0300 |
commit | d8ed9e87e6016433b8d178728a5391ea68101bca (patch) | |
tree | 5b4a890f5466bbf9aa882c5191eeeb08115429e8 /drivers/video/fbdev | |
parent | 60169c3fb78e5cd61cb1343e7f3c5edb72702a04 (diff) | |
download | linux-stable-d8ed9e87e6016433b8d178728a5391ea68101bca.tar.gz linux-stable-d8ed9e87e6016433b8d178728a5391ea68101bca.tar.bz2 linux-stable-d8ed9e87e6016433b8d178728a5391ea68101bca.zip |
fbdev: ssd1307fb: fix a possible NULL dereference
of_match_device could return NULL, and so cause a NULL pointer
dereference later.
For fixing this problem, we use of_device_get_match_data(), this will
simplify the code a little by using a standard function for
getting the match data.
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r-- | drivers/video/fbdev/ssd1307fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 6a18bdc9fe47..2925d5ce8d3e 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -559,8 +559,7 @@ static int ssd1307fb_probe(struct i2c_client *client, par->info = info; par->client = client; - par->device_info = of_match_device(ssd1307fb_of_match, - &client->dev)->data; + par->device_info = of_device_get_match_data(&client->dev); par->reset = of_get_named_gpio(client->dev.of_node, "reset-gpios", 0); |