[src/trunk]: src/sys/external/bsd/drm2/ttm Fix error branch: ttm_bo_unreserve...

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

details:   https://anonhg.NetBSD.org/src/rev/70de57773b2d
branches:  trunk
changeset: 809683:70de57773b2d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Jul 27 22:26:50 2015 +0000

description:
Fix error branch: ttm_bo_unreserve on failure after ttm_bo_reserve.

Tiny chance this will fix PR kern/49862 by not leaking a ww_mutex
lock.

diffstat:

 sys/external/bsd/drm2/ttm/ttm_bo_vm.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d6a229032e16 -r 70de57773b2d sys/external/bsd/drm2/ttm/ttm_bo_vm.c
--- a/sys/external/bsd/drm2/ttm/ttm_bo_vm.c     Mon Jul 27 19:27:04 2015 +0000
+++ b/sys/external/bsd/drm2/ttm/ttm_bo_vm.c     Mon Jul 27 22:26:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bo_vm.c,v 1.8 2014/11/06 13:14:31 riastradh Exp $  */
+/*     $NetBSD: ttm_bo_vm.c,v 1.9 2015/07/27 22:26:50 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.8 2014/11/06 13:14:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.9 2015/07/27 22:26:50 riastradh Exp $");
 
 #include <sys/types.h>
 
@@ -118,7 +118,7 @@
        /* drm prime buffers are not mappable.  XXX Catch this earlier?  */
        if (bo->ttm && ISSET(bo->ttm->page_flags, TTM_PAGE_FLAG_SG)) {
                ret = -EINVAL;
-               goto out0;
+               goto out1;
        }
 
        /* Notify the driver of a fault if it wants.  */
@@ -127,7 +127,7 @@
                if (ret) {
                        if (ret == -ERESTART)
                                ret = -EIO;
-                       goto out0;
+                       goto out1;
                }
        }