[src/netbsd-1-6]: src/sys/dev/ata Pull up revision 1.222 (requested by yamt i...

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

details:   https://anonhg.NetBSD.org/src/rev/b90be80076b0
branches:  netbsd-1-6
changeset: 528526:b90be80076b0
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jul 22 04:45:32 2002 +0000

description:
Pull up revision 1.222 (requested by yamt in ticket #536):
do previous differently for wddump case.

diffstat:

 sys/dev/ata/wd.c |  14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r b95ac7af107c -r b90be80076b0 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Mon Jul 22 04:44:07 2002 +0000
+++ b/sys/dev/ata/wd.c  Mon Jul 22 04:45:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.220.10.1 2002/07/22 04:44:07 lukem Exp $ */
+/*     $NetBSD: wd.c,v 1.220.10.2 2002/07/22 04:45:32 lukem Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.220.10.1 2002/07/22 04:44:07 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.220.10.2 2002/07/22 04:45:32 lukem Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -1284,9 +1284,7 @@
        }
   
        while (nblks > 0) {
-               int do_perror;
 again:
-               do_perror = 0;
                wd->sc_bp = NULL;
                wd->sc_wdc_bio.blkno = blkno;
                wd->sc_wdc_bio.flags = ATA_POLL;
@@ -1325,7 +1323,7 @@
                        break;
                case ERROR:
                        printf("wddump: ");
-                       do_perror = 1;
+                       wdperror(wd);
                        err = EIO;
                        break;
                case NOERROR: 
@@ -1338,12 +1336,6 @@
                        if (wddumpmulti != 1) {
                                wddumpmulti = 1; /* retry in single-sector */
                                printf(", retrying\n");
-                       }
-                       if (do_perror) {
-                               printf("wddump: ");
-                               wdperror(wd);
-                       }
-                       if (wddumpmulti != 1) {
                                goto again;
                        }
                        printf("\n");