aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/arkfb.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2007-06-01 03:46:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 11:18:28 -0400
commit38d473f99575f57f5911c7c94922fcf0b0a58b8d (patch)
treef0d9f967ac96a1a02658f6bcd399407b7e615fb7 /drivers/video/arkfb.c
parent2d9f95f916e926195a57b76064586ea0b1985848 (diff)
vt8623fb: arkfb: null pointer dereference fix
This patch prevents null pointer dereference in arkfb and vt8623fb. Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/arkfb.c')
-rw-r--r--drivers/video/arkfb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index ba6fede5c466..8a1b07c74394 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -1055,9 +1055,10 @@ err_enable_device:
1055static void __devexit ark_pci_remove(struct pci_dev *dev) 1055static void __devexit ark_pci_remove(struct pci_dev *dev)
1056{ 1056{
1057 struct fb_info *info = pci_get_drvdata(dev); 1057 struct fb_info *info = pci_get_drvdata(dev);
1058 struct arkfb_info *par = info->par;
1059 1058
1060 if (info) { 1059 if (info) {
1060 struct arkfb_info *par = info->par;
1061
1061#ifdef CONFIG_MTRR 1062#ifdef CONFIG_MTRR
1062 if (par->mtrr_reg >= 0) { 1063 if (par->mtrr_reg >= 0) {
1063 mtrr_del(par->mtrr_reg, 0, 0); 1064 mtrr_del(par->mtrr_reg, 0, 0);