diff options
| author | Robert Elliott <elliott@hp.com> | 2015-01-23 23:42:01 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2015-02-02 18:57:37 +0100 |
| commit | adf1b3a31bdf4ca1e0dfb0afd8cb551053944db9 (patch) | |
| tree | 46d7f5817be39f0190cc2a9821639498a816b96f /drivers/scsi/hpsa.c | |
| parent | hpsa: remove 0x from queue depth print which is in decimal (diff) | |
| download | linux-adf1b3a31bdf4ca1e0dfb0afd8cb551053944db9.tar.xz linux-adf1b3a31bdf4ca1e0dfb0afd8cb551053944db9.zip | |
hpsa: propagate hard_reset failures in reset_devices mode
Return the real reason for kdump_hard_reset failure rather
than change them all to -ENODEV.
Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index fbeef5bd036a..92ac76a61a3f 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -6416,11 +6416,8 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev) * "performant mode". Or, it might be 640x, which can't reset * due to concerns about shared bbwc between 6402/6404 pair. */ - if (rc) { - if (rc != -ENOTSUPP) /* just try to do the kdump anyhow. */ - rc = -ENODEV; + if (rc) goto out_disable; - } /* Now try to get the controller to respond to a no-op */ dev_warn(&pdev->dev, "Waiting for controller to respond to no-op\n"); |