[src/trunk]: src/sys/arch/sparc64/dev Merge change of OpenBSD rev 1.20:

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

details:   https://anonhg.NetBSD.org/src/rev/c24d29d36269
branches:  trunk
changeset: 749928:c24d29d36269
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sun Dec 13 05:21:06 2009 +0000

description:
Merge change of OpenBSD rev 1.20:

Remove debug printf and properly dequeue command instead when a read times out
on LOMLite2.

diffstat:

 sys/arch/sparc64/dev/lom.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 107becac47c0 -r c24d29d36269 sys/arch/sparc64/dev/lom.c
--- a/sys/arch/sparc64/dev/lom.c        Sun Dec 13 05:11:04 2009 +0000
+++ b/sys/arch/sparc64/dev/lom.c        Sun Dec 13 05:21:06 2009 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: lom.c,v 1.3 2009/11/28 04:14:27 nakayama Exp $ */
-/*     $OpenBSD: lom.c,v 1.19 2009/11/10 22:26:48 kettenis Exp $       */
+/*     $NetBSD: lom.c,v 1.4 2009/12/13 05:21:06 nakayama Exp $ */
+/*     $OpenBSD: lom.c,v 1.20 2009/12/12 13:01:00 kettenis Exp $       */
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lom.c,v 1.3 2009/11/28 04:14:27 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lom.c,v 1.4 2009/12/13 05:21:06 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -643,7 +643,7 @@
 
        error = tsleep(&lc, PZERO, "lom2rd", hz);
        if (error)
-               aprint_error_dev(sc->sc_dev, "lom2_read failed\n");
+               lom_dequeue_cmd(sc, &lc);
 
        *val = lc.lc_data;