Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=38d473f99575f57f5911c7c94922fcf0b0a58b8d Commit: 38d473f99575f57f5911c7c94922fcf0b0a58b8d Parent: 2d9f95f916e926195a57b76064586ea0b1985848 Author: Ondrej Zajicek <[EMAIL PROTECTED]> AuthorDate: Fri Jun 1 00:46:43 2007 -0700 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Fri Jun 1 08:18:28 2007 -0700
vt8623fb: arkfb: null pointer dereference fix This patch prevents null pointer dereference in arkfb and vt8623fb. Signed-off-by: Ondrej Zajicek <[EMAIL PROTECTED]> Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- drivers/video/arkfb.c | 3 ++- drivers/video/vt8623fb.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index ba6fede..8a1b07c 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c @@ -1055,9 +1055,10 @@ err_enable_device: static void __devexit ark_pci_remove(struct pci_dev *dev) { struct fb_info *info = pci_get_drvdata(dev); - struct arkfb_info *par = info->par; if (info) { + struct arkfb_info *par = info->par; + #ifdef CONFIG_MTRR if (par->mtrr_reg >= 0) { mtrr_del(par->mtrr_reg, 0, 0); diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 5e9755e..30c0b94 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c @@ -778,9 +778,10 @@ err_enable_device: static void __devexit vt8623_pci_remove(struct pci_dev *dev) { struct fb_info *info = pci_get_drvdata(dev); - struct vt8623fb_info *par = info->par; if (info) { + struct vt8623fb_info *par = info->par; + #ifdef CONFIG_MTRR if (par->mtrr_reg >= 0) { mtrr_del(par->mtrr_reg, 0, 0); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html