Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9145
b: refs/heads/master
c: d6dbf42
h: refs/heads/master
i:
  9143: 2161bd1
v: v3
  • Loading branch information
Mike Miller authored and Linus Torvalds committed Sep 21, 2005
1 parent 2dc96ec commit a1911d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c2822ccb1f8cc96fc006aa82e68e1944290014a
refs/heads/master: d6dbf42ee36d4f9ffc2a93877c19937c81974124
5 changes: 1 addition & 4 deletions trunk/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 a1911d2

Please sign in to comment.