Module Name: src
Committed By: riastradh
Date: Wed Jan 22 14:58:39 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c
Log Message:
Label fail4 is now used, so don't mark it __unused.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/i915drm/i915_pci.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/i915drm/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.8 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.9
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.8 Tue Jan 21 20:48:52 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jan 22 14:58:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.1.2.8 2014/01/21 20:48:52 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.8 2014/01/21 20:48:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -394,8 +394,7 @@ i915drm_fb_probe(struct drm_fb_helper *f
/* Success! */
return 1;
-fail4: __unused
- bus_space_unmap(dev->bst, sc->sc_fb_bsh, size);
+fail4: bus_space_unmap(dev->bst, sc->sc_fb_bsh, size);
fb_helper->fb = NULL;
fail3: drm_framebuffer_unreference(&dev_priv->fbdev->ifb.base);
fail2: i915_gem_object_unpin(sc->sc_fb_obj);
