patch-2.3.99-pre2 linux/drivers/video/cyber2000fb.c

Next file: linux/drivers/video/cyber2000fb.h
Previous file: linux/drivers/video/aty128fb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre1/linux/drivers/video/cyber2000fb.c linux/drivers/video/cyber2000fb.c
@@ -1175,6 +1175,7 @@
 int cyber2000fb_attach(struct cyberpro_info *info)
 {
 	if (current_par.initialised) {
+		info->dev     = current_par.dev;
 		info->regs    = CyberRegs;
 		info->fb      = current_par.screen_base;
 		info->fb_size = current_par.screen_size;
@@ -1402,7 +1403,15 @@
 
 	smem_base = dev->resource[0].start;
 	mmio_base = dev->resource[0].start + 0x00800000;
+	current_par.dev    = dev;
 	current_par.dev_id = dev->device;
+
+	err = pci_enable_device(dev);
+	if (err) {
+		printk("%s: unable to enable device: %d\n",
+			current_par.dev_name, err);
+		return err;
+	}
 
 	/*
 	 * Map in the registers

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)