From: Rasmus Andersen <rasmus@jaquet.dk>
To: jskov@cygnus.co.uk
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] make drivers/scsi/blz1230.c check request_irq return (240p3)
Date: Wed, 17 Jan 2001 23:13:53 +0100 [thread overview]
Message-ID: <20010117231353.A602@jaquet.dk> (raw)
Hi.
The following patch makes drivers/scsi/blz1230.c check request_irq's
return code. It applies cleanly against 240p3 and ac9.
It also swaps two lines in an existing error path (esp_deallocate/
scsi_unregister) since this seems wrong.
Comments?
--- linux-ac9/drivers/scsi/blz1230.c.org Sun Jan 14 19:58:47 2001
+++ linux-ac9/drivers/scsi/blz1230.c Wed Jan 17 23:09:45 2001
@@ -88,13 +88,8 @@
esp_write(eregs->esp_cfg1, (ESP_CONFIG1_PENABLE | 7));
udelay(5);
- if(esp_read(eregs->esp_cfg1) != (ESP_CONFIG1_PENABLE | 7)){
- esp_deallocate(esp);
- scsi_unregister(esp->ehost);
- release_mem_region(board+REAL_BLZ1230_ESP_ADDR,
- sizeof(struct ESP_regs));
- return 0; /* Bail out if address did not hold data */
- }
+ if(esp_read(eregs->esp_cfg1) != (ESP_CONFIG1_PENABLE | 7))
+ goto err_out;
/* Do command transfer with programmed I/O */
esp->do_pio_cmds = 1;
@@ -140,8 +135,9 @@
esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+REAL_BLZ1230_ESP_ADDR;
- request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
- "Blizzard 1230 SCSI IV", esp_intr);
+ if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
+ "Blizzard 1230 SCSI IV", esp_intr))
+ goto err_out;
/* Figure out our scsi ID on the bus */
esp->scsi_id = 7;
@@ -156,6 +152,13 @@
return esps_in_use;
}
}
+ return 0;
+
+ err_out:
+ scsi_unregister(esp->ehost);
+ esp_deallocate(esp);
+ release_mem_region(board+REAL_BLZ1230_ESP_ADDR,
+ sizeof(struct ESP_regs));
return 0;
}
--
Regards,
Rasmus(rasmus@jaquet.dk)
Half this game is ninety percent mental.
-Philadelphia Phillies manager Danny Ozark
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
reply other threads:[~2001-01-17 22:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20010117231353.A602@jaquet.dk \
--to=rasmus@jaquet.dk \
--cc=jskov@cygnus.co.uk \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.