diff options
| author | Mike Miller <mike.miller@hp.com> | 2005-09-21 09:55:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 10:11:54 -0700 |
| commit | d6dbf42ee36d4f9ffc2a93877c19937c81974124 (patch) | |
| tree | f7896850214230318c504b58f81cdbab5401ca96 /drivers/block | |
| parent | 3c2822ccb1f8cc96fc006aa82e68e1944290014a (diff) | |
| download | blackbird-op-linux-d6dbf42ee36d4f9ffc2a93877c19937c81974124.tar.gz blackbird-op-linux-d6dbf42ee36d4f9ffc2a93877c19937c81974124.zip | |
[PATCH] cciss: busy_initializing bug fix
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index c56f995aadad..486b6e1c7dfb 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -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; /* @@ -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]); @@ -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: |
