Module Name: src
Committed By: riastradh
Date: Wed May 14 04:38:49 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm: drm_memory.c
Log Message:
Fix error branch in drm_limit_dma_space.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_memory.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/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.2 src/sys/external/bsd/drm2/drm/drm_memory.c:1.3
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Wed May 14 04:38:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_memory.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $ */
+/* $NetBSD: drm_memory.c,v 1.3 2014/05/14 04:38:49 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.3 2014/05/14 04:38:49 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "agp_i810.h"
@@ -253,7 +253,7 @@ int
drm_limit_dma_space(struct drm_device *dev, resource_size_t min_addr,
resource_size_t max_addr)
{
- int error;
+ int ret;
KASSERT(min_addr <= max_addr);
@@ -274,11 +274,13 @@ drm_limit_dma_space(struct drm_device *d
* the caller should try to allocate DMA-safe memory on failure
* anyway, but...paranoia).
*/
- error = bus_dmatag_subregion(dev->bus_dmat, min_addr, max_addr,
+ /* XXX errno NetBSD->Linux */
+ ret = -bus_dmatag_subregion(dev->bus_dmat, min_addr, max_addr,
&dev->dmat, BUS_DMA_WAITOK);
- if (error) {
+ if (ret) {
dev->dmat = dev->bus_dmat;
- return error;
+ dev->dmat_subregion_p = false;
+ return ret;
}
/*
