Index: cb7210_init.c
===================================================================
RCS file: /cvsroot/linux-gpib/linux-gpib/driver/cb7210/cb7210_init.c,v
retrieving revision 1.46
retrieving revision 1.48
diff -u -r1.46 -r1.48
--- cb7210_init.c	5 Jun 2004 16:00:32 -0000	1.46
+++ cb7210_init.c	6 Aug 2004 07:07:28 -0000	1.48
@@ -365,7 +365,7 @@
 		return -1;
 	}
 
-	if(pci_request_regions(cb_priv->pci_device, "pci-gpib"))
+	if(pci_request_regions(cb_priv->pci_device, "cb7210"))
 		return -1;
 
 	cb_priv->amcc_iobase = pci_resource_start( cb_priv->pci_device, 0 );
@@ -373,7 +373,7 @@
 	cb_priv->fifo_iobase = pci_resource_start( cb_priv->pci_device, 2 );
 
 	isr_flags |= SA_SHIRQ;
-	if(request_irq(cb_priv->pci_device->irq, cb_pci_interrupt, isr_flags, "pci-gpib", board))
+	if(request_irq(cb_priv->pci_device->irq, cb_pci_interrupt, isr_flags, "cb7210", board))
 	{
 		printk( "cb7210: can't request IRQ %d\n",cb_priv->pci_device->irq );
 		return -1;
@@ -424,14 +424,15 @@
 
 	retval = cb7210_generic_attach(board);
 	if(retval) return retval;
-
-	if( request_region(board->ibbase, cb7210_iosize, "isa-gpib") == 0 );
+	cb_priv = board->private_data;
+	nec_priv = &cb_priv->nec7210_priv;
+	if(request_region(board->ibbase, cb7210_iosize, "cb7210") == 0)
 	{
-		printk("gpib: ioports are already in use");
-		return -1;
+		printk("gpib: ioports starting at 0x%lx are already in use\n", board->ibbase);
+		return -EIO;
 	}
 	nec_priv->iobase = board->ibbase;
-	board->fifo_iobase = nec_priv->iobase;
+	cb_priv->fifo_iobase = nec_priv->iobase;
 	
 	bits = irq_bits( board->ibirq );
 	if( bits == 0 )
@@ -440,10 +441,10 @@
 	}
 
 	// install interrupt handler
-	if(request_irq(board->ibirq, cb7210_interrupt, isr_flags, "isa-gpib", board))
+	if(request_irq(board->ibirq, cb7210_interrupt, isr_flags, "cb7210", board))
 	{
 		printk("gpib: can't request IRQ %d\n", board->ibirq);
-		return -1;
+		return -EBUSY;
 	}
 	cb_priv->irq = board->ibirq;
 
