diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/scsi/ibmvscsi/rpa_vscsi.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/scsi/ibmvscsi/rpa_vscsi.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/rpa_vscsi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c index cafef9cbbe2e..01b8ac641eb8 100644 --- a/drivers/scsi/ibmvscsi/rpa_vscsi.c +++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c | |||
| @@ -235,6 +235,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, | |||
| 235 | if (rc == 2) { | 235 | if (rc == 2) { |
| 236 | /* Adapter is good, but other end is not ready */ | 236 | /* Adapter is good, but other end is not ready */ |
| 237 | printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n"); | 237 | printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n"); |
| 238 | retrc = 0; | ||
| 238 | } else if (rc != 0) { | 239 | } else if (rc != 0) { |
| 239 | printk(KERN_WARNING "ibmvscsi: Error %d opening adapter\n", rc); | 240 | printk(KERN_WARNING "ibmvscsi: Error %d opening adapter\n", rc); |
| 240 | goto reg_crq_failed; | 241 | goto reg_crq_failed; |