diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h index 0900832eac32..cfe98fb835b2 100644 --- a/sys/dev/ata/atavar.h +++ b/sys/dev/ata/atavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: atavar.h,v 1.102 2019/04/05 20:44:09 christos Exp $ */ +/* $NetBSD: atavar.h,v 1.103 2019/04/05 21:31:44 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. @@ -117,7 +117,6 @@ struct ata_command { #define AT_READREG 0x1000 /* Read registers on completion */ #define AT_LBA 0x2000 /* LBA28 */ #define AT_LBA48 0x4000 /* LBA48 */ -#define AT_RST_NOCMD 0x8000 /* ??? */ int timeout; /* timeout (in ms) */ void *data; /* Data buffer address */ diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index dd80869ca3cd..f67d9d375e14 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.447 2019/04/05 18:23:45 bouyer Exp $ */ +/* $NetBSD: wd.c,v 1.448 2019/04/05 21:31:44 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -54,7 +54,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.447 2019/04/05 18:23:45 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.448 2019/04/05 21:31:44 bouyer Exp $"); #include "opt_ata.h" #include "opt_wd.h" @@ -1647,8 +1647,7 @@ again: case CMD_ERR: if (retry == 0) { retry++; - (*wd->atabus->ata_reset_drive)(wd->drvp, - flags | AT_RST_NOCMD, NULL); + (*wd->atabus->ata_reset_drive)(wd->drvp, flags, NULL); goto again; }