summaryrefslogtreecommitdiff
path: root/drivers/scsi/zalon.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-24 23:55:22 +0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-25 20:37:23 +0400
commitd3a263a8168f78874254ea9da9595cfb0f3e96d7 (patch)
treebfbe8c87ff990a9530cc3b3be7b4994705986801 /drivers/scsi/zalon.c
parente3f47cc74bddea8121560026185ede4770170043 (diff)
downloadlinux-d3a263a8168f78874254ea9da9595cfb0f3e96d7.tar.xz
[SCSI] zalon: fix oops on attach failure
I recently discovered on my zalon that if the attachment fails because of a bus misconfiguration (I scrapped my HVD array, so the card is now unterminated) then the system oopses. The reason is that if ncr_attach() returns NULL (signalling failure) that NULL is passed by the goto failed straight into ncr_detach() which oopses. The fix is just to return -ENODEV in this case. Cc: Stable Tree <stable@kernel.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/zalon.c')
-rw-r--r--drivers/scsi/zalon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 97f3158fa7b5..27e84e4b1fa9 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -134,7 +134,7 @@ zalon_probe(struct parisc_device *dev)
host = ncr_attach(&zalon7xx_template, unit, &device);
if (!host)
- goto fail;
+ return -ENODEV;
if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
dev_printk(KERN_ERR, &dev->dev, "irq problem with %d, detaching\n ",