Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ata Don't return EPASSTHROUGH when succeeding in ODI...
details: https://anonhg.NetBSD.org/src/rev/9788c4df2e2b
branches: trunk
changeset: 789460:9788c4df2e2b
user: skrll <skrll%NetBSD.org@localhost>
date: Mon Aug 19 14:58:57 2013 +0000
description:
Don't return EPASSTHROUGH when succeeding in ODIOCGDINFO or ODIOCGDEFLABEL
diffstat:
sys/dev/ata/wd.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (35 lines):
diff -r c5558388a4e1 -r 9788c4df2e2b sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c Mon Aug 19 13:03:12 2013 +0000
+++ b/sys/dev/ata/wd.c Mon Aug 19 14:58:57 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.404 2013/08/06 19:13:13 soren Exp $ */
+/* $NetBSD: wd.c,v 1.405 2013/08/19 14:58:57 skrll Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.404 2013/08/06 19:13:13 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.405 2013/08/19 14:58:57 skrll Exp $");
#include "opt_ata.h"
@@ -1169,7 +1169,7 @@
{
struct wd_softc *wd =
device_lookup_private(&wd_cd, WDUNIT(dev));
- int error = 0, s;
+ int error, s;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel *newlabel = NULL;
#endif
@@ -1183,6 +1183,7 @@
if (error != EPASSTHROUGH)
return (error);
+ error = 0;
switch (xfer) {
#ifdef HAS_BAD144_HANDLING
case DIOCSBAD:
Home |
Main Index |
Thread Index |
Old Index