Skip to content

Commit

Permalink
[PATCH] cciss: busy_initializing bug fix
Browse files Browse the repository at this point in the history
This patch fixes the problem Bjorn reported.  The busy_initializing flag
should have cleared before going into the for loop.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Mike Miller authored and Linus Torvalds committed Sep 21, 2005
1 parent 3c2822c commit d6dbf42
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/block/cciss.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,6 @@ static int cciss_open(struct inode *inode, struct file *filep)
printk(KERN_DEBUG "cciss_open %s\n", inode->i_bdev->bd_disk->disk_name);
#endif /* CCISS_DEBUG */

if (host->busy_initializing)
return -EBUSY;

if (host->busy_initializing || drv->busy_configuring)
return -EBUSY;
/*
Expand Down Expand Up @@ -2991,6 +2988,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);

cciss_procinit(i);
hba[i]->busy_initializing = 0;

for(j=0; j < NWD; j++) { /* mfm */
drive_info_struct *drv = &(hba[i]->drv[j]);
Expand Down Expand Up @@ -3033,7 +3031,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
add_disk(disk);
}

hba[i]->busy_initializing = 0;
return(1);

clean4:
Expand Down

0 comments on commit d6dbf42

Please sign in to comment.