From: LABBE Corentin Date: Tue, 16 Aug 2016 09:27:18 +0000 (+0200) Subject: fbdev: ssd1307fb: fix a possible NULL dereference X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d8ed9e87e6016433b8d178728a5391ea68101bca;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Tomi Valkeinen --- 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);