ia64/xen-unstable

changeset 1115:bc02f2f73b0e

bitkeeper revision 1.742 (403b2eea9iIV_Lr_MD1d39gzfruVbw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/maw/xeno-unstable-tbufs.bk
author kaf24@scramble.cl.cam.ac.uk
date Tue Feb 24 11:00:58 2004 +0000 (2004-02-24)
parents 143fb3c2e3b5 6f46495a58dd
children 8829a6af2d2c
files xen/drivers/block/cciss.c
line diff
     1.1 --- a/xen/drivers/block/cciss.c	Mon Feb 23 17:56:51 2004 +0000
     1.2 +++ b/xen/drivers/block/cciss.c	Tue Feb 24 11:00:58 2004 +0000
     1.3 @@ -443,6 +443,10 @@ void cciss_probe_devices(xen_disk_info_t
     1.4  
     1.5      ctlr = 0;  /* XXX SMH: only deal with 1 controller for now */
     1.6  
     1.7 +    /* Bail if there is no controller. */
     1.8 +    if ( hba[ctlr] == NULL )
     1.9 +        return;
    1.10 +
    1.11      /* Loop through each real device */ 
    1.12      for(i=0; i < NWD; i++) {
    1.13  	
    1.14 @@ -450,11 +454,10 @@ void cciss_probe_devices(xen_disk_info_t
    1.15  	
    1.16  	if (!(drv->nr_blocks))
    1.17              continue;
    1.18 -	
    1.19 +
    1.20  	if ( xdi->count == xdi->max )
    1.21  	    BUG();
    1.22 -	
    1.23 -	
    1.24 +
    1.25  	hba[ctlr]->hd[i << NWD_SHIFT].nr_sects = 
    1.26  	    hba[ctlr]->sizes[i << NWD_SHIFT] = drv->nr_blocks;
    1.27  	
    1.28 @@ -3409,7 +3412,7 @@ static struct pci_driver cciss_pci_drive
    1.29  int __init cciss_init(void)
    1.30  {
    1.31  
    1.32 -	printk(KERN_INFO DRIVER_NAME "\n");
    1.33 +/*	printk(KERN_INFO DRIVER_NAME "\n");*/
    1.34  	/* Register for out PCI devices */
    1.35  	return pci_module_init(&cciss_pci_driver);
    1.36  }