Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Destroy the DMA subregion tag on error in drm_pci_detach. 

Now that drm_pci_attach calls the driver load function, rather than
deferring it to the caller, the DMA subregion tag can be created
here.
This commit is contained in:
riastradh 2014-07-17 21:13:49 +00:00
parent df1a87486b
commit db544f2dc6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/external/bsd/drm2/pci/drm_pci.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: drm_pci.c,v 1.4 2014/07/16 20:56:25 riastradh Exp $ */ /* $NetBSD: drm_pci.c,v 1.5 2014/07/17 21:13:49 riastradh Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.4 2014/07/16 20:56:25 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.5 2014/07/17 21:13:49 riastradh Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/errno.h> #include <sys/errno.h>
@ -167,7 +167,8 @@ fail2: __unused
fail1: drm_pci_agp_destroy(dev); fail1: drm_pci_agp_destroy(dev);
dev->bus_nmaps = 0; dev->bus_nmaps = 0;
kmem_free(dev->bus_maps, PCI_NUM_RESOURCES * sizeof(dev->bus_maps[0])); kmem_free(dev->bus_maps, PCI_NUM_RESOURCES * sizeof(dev->bus_maps[0]));
KASSERT(!dev->dmat_subregion_p); if (dev->dmat_subregion_p)
bus_dmatag_destroy(dev->dmat);
drm_dev_unref(dev); drm_dev_unref(dev);
fail0: return ret; fail0: return ret;
} }