diff options
author | Mike Miller <mike.miller@hp.com> | 2005-09-21 12:55:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 13:11:54 -0400 |
commit | d6dbf42ee36d4f9ffc2a93877c19937c81974124 (patch) | |
tree | f7896850214230318c504b58f81cdbab5401ca96 /drivers/block | |
parent | 3c2822ccb1f8cc96fc006aa82e68e1944290014a (diff) |
[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) | |||
483 | printk(KERN_DEBUG "cciss_open %s\n", inode->i_bdev->bd_disk->disk_name); | 483 | printk(KERN_DEBUG "cciss_open %s\n", inode->i_bdev->bd_disk->disk_name); |
484 | #endif /* CCISS_DEBUG */ | 484 | #endif /* CCISS_DEBUG */ |
485 | 485 | ||
486 | if (host->busy_initializing) | ||
487 | return -EBUSY; | ||
488 | |||
489 | if (host->busy_initializing || drv->busy_configuring) | 486 | if (host->busy_initializing || drv->busy_configuring) |
490 | return -EBUSY; | 487 | return -EBUSY; |
491 | /* | 488 | /* |
@@ -2991,6 +2988,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
2991 | hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON); | 2988 | hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON); |
2992 | 2989 | ||
2993 | cciss_procinit(i); | 2990 | cciss_procinit(i); |
2991 | hba[i]->busy_initializing = 0; | ||
2994 | 2992 | ||
2995 | for(j=0; j < NWD; j++) { /* mfm */ | 2993 | for(j=0; j < NWD; j++) { /* mfm */ |
2996 | drive_info_struct *drv = &(hba[i]->drv[j]); | 2994 | drive_info_struct *drv = &(hba[i]->drv[j]); |
@@ -3033,7 +3031,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
3033 | add_disk(disk); | 3031 | add_disk(disk); |
3034 | } | 3032 | } |
3035 | 3033 | ||
3036 | hba[i]->busy_initializing = 0; | ||
3037 | return(1); | 3034 | return(1); |
3038 | 3035 | ||
3039 | clean4: | 3036 | clean4: |