Module Name: src Committed By: nakayama Date: Sun Dec 13 05:21:06 UTC 2009
Modified Files: src/sys/arch/sparc64/dev: lom.c Log Message: Merge change of OpenBSD rev 1.20: Remove debug printf and properly dequeue command instead when a read times out on LOMLite2. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/dev/lom.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/arch/sparc64/dev/lom.c diff -u src/sys/arch/sparc64/dev/lom.c:1.3 src/sys/arch/sparc64/dev/lom.c:1.4 --- src/sys/arch/sparc64/dev/lom.c:1.3 Sat Nov 28 04:14:27 2009 +++ src/sys/arch/sparc64/dev/lom.c Sun Dec 13 05:21:06 2009 @@ -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;