From f30a453999fec0c2824ec2a853783e3569efb361 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 17 Feb 2011 23:29:16 +0200 Subject: [PATCH] --- yaml --- r: 235993 b: refs/heads/master c: 45dcfaf150c4adb50149078205ad3e60bd7d789d h: refs/heads/master i: 235991: 3c69f216e82f1b2cccba5f010869ac9626793b24 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cfbc0e9fab6a..d1b0d551e14b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c0ef2ac365ced91b819917e56dcd6795b5bef5a +refs/heads/master: 45dcfaf150c4adb50149078205ad3e60bd7d789d diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index f69ff574767e..6e86830cc52d 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -3428,8 +3428,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, static void __devexit xgifb_remove(struct pci_dev *pdev) { - /* Unregister the framebuffer */ - /* if (xgi_video_info.registered) { */ unregister_framebuffer(fb_info); iounmap(xgi_video_info.mmio_vbase); iounmap(xgi_video_info.video_vbase); @@ -3438,11 +3436,8 @@ static void __devexit xgifb_remove(struct pci_dev *pdev) xgi_video_info.video_size); vfree(XGIhw_ext.pjVirtualRomBase); framebuffer_release(fb_info); - /* } */ - pci_set_drvdata(pdev, NULL); - -}; +} static struct pci_driver xgifb_driver = { .name = "xgifb",