Commit 47ebea83 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] drivers/video/s3fb.c: fix a use-before-check

NULL checks should be before the first dereference.

Spotted by the Coverity checker.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarOndrej Zajicek <santiago@crfreenet.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fffda91e
...@@ -1000,11 +1000,12 @@ err_enable_device: ...@@ -1000,11 +1000,12 @@ err_enable_device:
static void __devexit s3_pci_remove(struct pci_dev *dev) static void __devexit s3_pci_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
struct s3fb_info *par = info->par;
if (info) { if (info) {
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
struct s3fb_info *par = info->par;
if (par->mtrr_reg >= 0) { if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0); mtrr_del(par->mtrr_reg, 0, 0);
par->mtrr_reg = -1; par->mtrr_reg = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment