summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2007-04-18 07:17:45 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2007-04-18 07:17:45 +0000
commit208301d999a576ee6ae91e2fa793537a988d6196 (patch)
tree2d8b9ec115828430d978bd962e17e680851f451e /sys/dev
parentba19d9d094f5c9efac0f74c4615572b9acb17af7 (diff)
callers of sw_reset will print an error message if anythign goes wrong, so
sw_reset itself doesnt have to
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_tht.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index 620d4e7846f..3780f52558a 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tht.c,v 1.23 2007/04/18 07:13:11 dlg Exp $ */
+/* $OpenBSD: if_tht.c,v 1.24 2007/04/18 07:17:44 dlg Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -578,10 +578,8 @@ tht_sw_reset(struct tht_softc *sc)
tht_swrst_set(sc, THT_REG_DIS_QU_1);
/* 4. wait for successful finish of previous tasks */
- if (!tht_wait_set(sc, THT_REG_RST_PRT, THT_REG_RST_PRT_ACTIVE, 1000)) {
- printf("%s: port reset didnt become active\n", DEVNAME(sc));
+ if (!tht_wait_set(sc, THT_REG_RST_PRT, THT_REG_RST_PRT_ACTIVE, 1000))
return (1);
- }
/* 5. Reset interrupt registers */
tht_write(sc, THT_REG_IMR, 0x0); /* 5.a */