Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Fix previous, was all wrong. noticed by enami.



details:   https://anonhg.NetBSD.org/src/rev/b5541b26561d
branches:  trunk
changeset: 758878:b5541b26561d
user:      dholland <dholland%NetBSD.org@localhost>
date:      Fri Nov 19 09:11:45 2010 +0000

description:
Fix previous, was all wrong. noticed by enami.

diffstat:

 sys/dev/ccd.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 0e20dce7e8bb -r b5541b26561d sys/dev/ccd.c
--- a/sys/dev/ccd.c     Fri Nov 19 09:08:26 2010 +0000
+++ b/sys/dev/ccd.c     Fri Nov 19 09:11:45 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ccd.c,v 1.136 2010/11/19 06:44:39 dholland Exp $       */
+/*     $NetBSD: ccd.c,v 1.137 2010/11/19 09:11:45 dholland Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -127,7 +127,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.136 2010/11/19 06:44:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.137 2010/11/19 09:11:45 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1173,10 +1173,9 @@
                                printf("ccdioctl: lookedup = %d\n", lookedup);
 #endif
                        error = pathbuf_copyin(cpp[i], &pb);
-                       if (error) {
-                               goto out;
+                       if (error == 0) {
+                               error = dk_lookup(pb, l, &vpp[i]);
                        }
-                       error = dk_lookup(pb, l, &vpp[i]);
                        pathbuf_destroy(pb);
                        if (error != 0) {
                                for (j = 0; j < lookedup; ++j)



Home | Main Index | Thread Index | Old Index