summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2010-08-18 15:55:20 +0000
committerAlexander Motin <mav@FreeBSD.org>2010-08-18 15:55:20 +0000
commit82f3a5519484836da8eb17aa900e918a58d89fc8 (patch)
treedb34b7b6a72d420c8104b1d2c8d6dbdc64a27191 /sys
parentb1d8056c7f848232e3a85cb81ab4594fda520198 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/siis/siis.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 9d026e4ce808..edb9d12dff6b 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -478,9 +478,9 @@ siis_ch_attach(device_t dev)
rid = ATA_IRQ_RID;
if (!(ch->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
&rid, RF_SHAREABLE | RF_ACTIVE))) {
- bus_release_resource(dev, SYS_RES_MEMORY, ch->unit, ch->r_mem);
device_printf(dev, "Unable to map interrupt\n");
- return (ENXIO);
+ error = ENXIO;
+ goto err0;
}
if ((bus_setup_intr(dev, ch->r_irq, ATA_INTR_FLAGS, NULL,
siis_ch_intr_locked, dev, &ch->ih))) {
@@ -499,9 +499,10 @@ siis_ch_attach(device_t dev)
ch->sim = cam_sim_alloc(siisaction, siispoll, "siisch", ch,
device_get_unit(dev), &ch->mtx, 2, SIIS_MAX_SLOTS, devq);
if (ch->sim == NULL) {
+ cam_simq_free(devq);
device_printf(dev, "unable to allocate sim\n");
error = ENOMEM;
- goto err2;
+ goto err1;
}
if (xpt_bus_register(ch->sim, dev, 0) != CAM_SUCCESS) {
device_printf(dev, "unable to register xpt bus\n");
@@ -523,6 +524,7 @@ err2:
cam_sim_free(ch->sim, /*free_devq*/TRUE);
err1:
bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ch->r_irq);
+err0:
bus_release_resource(dev, SYS_RES_MEMORY, ch->unit, ch->r_mem);
mtx_unlock(&ch->mtx);
return (error);