diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
| commit | 4af358f81881e1d083a916c9269b5ac0936e180d (patch) | |
| tree | c0533d3268daccb6f06f1180aa1ae8f1aac17d36 /drivers/scsi/ibmvscsi/ibmvfc.c | |
| parent | 7653aaab775d4c205a7dce52850c8e3d4f31d4ea (diff) | |
| parent | b63d10130e68aa6480cc1b2483d7c5ce57a05481 (diff) | |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvfc.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index b7650613b8c..bdfa223a7db 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -4306,8 +4306,8 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost) spin_lock_irqsave(vhost->host->host_lock, flags); if (rc == H_CLOSED) vio_enable_interrupts(to_vio_dev(vhost->dev)); - else if (rc || (rc = ibmvfc_send_crq_init(vhost)) || - (rc = vio_enable_interrupts(to_vio_dev(vhost->dev)))) { + if (rc || (rc = ibmvfc_send_crq_init(vhost)) || + (rc = vio_enable_interrupts(to_vio_dev(vhost->dev)))) { ibmvfc_link_down(vhost, IBMVFC_LINK_DEAD); dev_err(vhost->dev, "Error after reset (rc=%d)\n", rc); } |