[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo Fix ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6470eda49127
branches:  trunk
changeset: 835124:6470eda49127
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:39:56 2018 +0000

description:
Fix typos from hasty merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r c3374399792a -r 6470eda49127 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c   Mon Aug 27 07:39:44 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c   Mon Aug 27 07:39:56 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.3 2018/08/27 07:35:56 riastradh Exp $      */
+/*     $NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.4 2018/08/27 07:39:56 riastradh Exp $      */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.3 2018/08/27 07:35:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.4 2018/08/27 07:39:56 riastradh Exp $");
 
 #include "chan.h"
 
@@ -279,7 +279,7 @@
                goto out;
 
        /* XXX errno NetBSD->Linux */
-       int ret = -bus_space_map(chan->bst, chan->addr, chan->size, 0,
+       ret = -bus_space_map(chan->bst, chan->addr, chan->size, 0,
            &chan->bsh);
        if (ret)
                return ret;
@@ -295,7 +295,7 @@
 {
        struct nvkm_fifo_chan *chan = nvkm_fifo_chan(object);
 #ifdef __NetBSD__
-       int ret = nvkm_fifo_chan_ensure_mapped(object);
+       int ret = nvkm_fifo_chan_ensure_mapped(chan);
        if (ret)
                return ret;
 #else
@@ -320,7 +320,7 @@
 {
        struct nvkm_fifo_chan *chan = nvkm_fifo_chan(object);
 #ifdef __NetBSD__
-       int ret = nvkm_fifo_chan_ensure_mapped(object);
+       int ret = nvkm_fifo_chan_ensure_mapped(chan);
        if (ret)
                return ret;
 #else