diff options
| author | Eric Northup <digitaleric@google.com> | 2014-03-12 13:42:35 -0700 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2014-03-20 12:35:47 -0400 |
| commit | 5e03881f98b3331f2459e00101474c06a8f3a065 (patch) | |
| tree | 6a413cc7641e2bb847672136e099e71fd707728d | |
| parent | 9b9c2403f9e990397c2757a922a4022cfa0c8155 (diff) | |
| download | seabios-5e03881f98b3331f2459e00101474c06a8f3a065.zip seabios-5e03881f98b3331f2459e00101474c06a8f3a065.tar.gz seabios-5e03881f98b3331f2459e00101474c06a8f3a065.tar.bz2 | |
init_virtio_blk, init_virtio_scsi: reset HBA on error
Extend commit 5f2d17d35b2339526f3b3d580b279ea78e406a25: reset on all error
paths, and also for virtio_blk not just virtio_scsi.
Signed-off-by: Eric Northup <digitaleric@google.com>
| -rw-r--r-- | src/hw/virtio-blk.c | 1 | ||||
| -rw-r--r-- | src/hw/virtio-scsi.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c index 7b22bf5..e2dbd3c 100644 --- a/src/hw/virtio-blk.c +++ b/src/hw/virtio-blk.c @@ -153,6 +153,7 @@ init_virtio_blk(struct pci_device *pci) return; fail: + vp_reset(ioaddr); free(vdrive->vq); free(vdrive); } diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c index 48fb3e1..8f96687 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -158,14 +158,13 @@ init_virtio_scsi(struct pci_device *pci) for (tot = 0, i = 0; i < 256; i++) tot += virtio_scsi_scan_target(pci, ioaddr, vq, i); - if (!tot) { - vp_reset(ioaddr); + if (!tot) goto fail; - } return; fail: + vp_reset(ioaddr); free(vq); } |