Module Name: src
Committed By: riastradh
Date: Thu Nov 5 20:31:26 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device:
nouveau_engine_device_base.c
Log Message:
Return error from bus_space_map.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.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/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:1.6 src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:1.6 Thu Nov 5 20:26:10 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c Thu Nov 5 20:31:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_engine_device_base.c,v 1.6 2015/11/05 20:26:10 riastradh Exp $ */
+/* $NetBSD: nouveau_engine_device_base.c,v 1.7 2015/11/05 20:31:26 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.6 2015/11/05 20:26:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.7 2015/11/05 20:31:26 riastradh Exp $");
#include <core/object.h>
#include <core/device.h>
@@ -177,8 +177,10 @@ nouveau_devobj_ctor(struct nouveau_objec
if (!(args->disable & NV_DEVICE_DISABLE_IDENTIFY) &&
!device->card_type) {
#ifdef __NetBSD__
- if (bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh) != 0)
- return -ENOMEM;
+ /* XXX errno NetBSD->Linux */
+ ret = -bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh);
+ if (ret)
+ return ret;
#ifndef __BIG_ENDIAN
if (bus_space_read_4(mmiot, mmioh, 4) != 0)
@@ -293,10 +295,11 @@ nouveau_devobj_ctor(struct nouveau_objec
#ifdef __NetBSD__
if (!(args->disable & NV_DEVICE_DISABLE_MMIO) &&
!nv_subdev(device)->mmiosz) {
- if (bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh)
- != 0) {
+ /* XXX errno NetBSD->Linux */
+ ret = -bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh);
+ if (ret) {
nv_error(device, "unable to map device registers\n");
- return -ENOMEM;
+ return ret;
}
nv_subdev(device)->mmiot = mmiot;
nv_subdev(device)->mmioh = mmioh;
