patch-2.4.15 linux/drivers/video/imsttfb.c

• Lines: 27
• Date: Wed Nov 14 14:52:20 2001
• Orig file: v2.4.14/linux/drivers/video/imsttfb.c
• Orig date: Tue Oct 23 22:48:52 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/video/imsttfb.c linux/drivers/video/imsttfb.c
@@ -1950,7 +1950,7 @@
 
 	init_imstt(p);
 
-	pdev->driver_data = p;
+	pci_set_drvdata(pdev, p);
 
 	return 0;
 }
@@ -1958,7 +1958,7 @@
 static void __devexit
 imsttfb_remove(struct pci_dev *pdev)
 {
-	struct fb_info_imstt *p = (struct fb_info_imstt *)pdev->driver_data;
+	struct fb_info_imstt *p = pci_get_drvdata(pdev);
 
 	unregister_framebuffer(&p->info);
 	iounmap(p->cmap_regs);
@@ -1977,7 +1977,7 @@
 	if (!options || !*options)
 		return 0;
 
-	while (this_opt = strsep(&options, ",")) {
+	while ((this_opt = strsep(&options, ",")) != NULL) {
 		if (!strncmp(this_opt, "font:", 5)) {
 			char *p;
 			int i;