video: fbdev: s3fb.c: Fix for possible null pointer dereference
authorRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Tue, 20 May 2014 21:37:32 +0000 (23:37 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 23 May 2014 10:47:31 +0000 (13:47 +0300)
There is otherwise a risk of a possible null pointer dereference.

Was largely found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/s3fb.c

index 9a3f8f1c6aabdc9d14220c223cb97a735a799497..c43b969e1e23c98f88f348b118fa4c462afdab9c 100644 (file)
@@ -1401,9 +1401,10 @@ err_enable_device:
 static void s3_pci_remove(struct pci_dev *dev)
 {
        struct fb_info *info = pci_get_drvdata(dev);
-       struct s3fb_info __maybe_unused *par = info->par;
+       struct s3fb_info __maybe_unused *par;
 
        if (info) {
+               par = info->par;
 
 #ifdef CONFIG_MTRR
                if (par->mtrr_reg >= 0) {