Module Name: src Committed By: yamaguchi Date: Thu Oct 21 07:08:56 UTC 2021
Modified Files: src/sys/dev/pci: virtio.c Log Message: virtio: fix missing release of interrupt resources To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/virtio.c diff -u src/sys/dev/pci/virtio.c:1.51 src/sys/dev/pci/virtio.c:1.52 --- src/sys/dev/pci/virtio.c:1.51 Thu Oct 21 05:37:43 2021 +++ src/sys/dev/pci/virtio.c Thu Oct 21 07:08:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: virtio.c,v 1.51 2021/10/21 05:37:43 yamaguchi Exp $ */ +/* $NetBSD: virtio.c,v 1.52 2021/10/21 07:08:55 yamaguchi Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.51 2021/10/21 05:37:43 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.52 2021/10/21 07:08:55 yamaguchi Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1214,6 +1214,7 @@ virtio_child_attach_finish(struct virtio r = sc->sc_ops->setup_interrupts(sc, 0); if (r != 0) { aprint_error_dev(sc->sc_dev, "failed to setup interrupts\n"); + goto fail; } KASSERT(sc->sc_soft_ih == NULL); @@ -1240,6 +1241,8 @@ fail: sc->sc_soft_ih = NULL; } + sc->sc_ops->free_interrupts(sc); + virtio_set_status(sc, VIRTIO_CONFIG_DEVICE_STATUS_FAILED); return 1; }