summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2006-03-18 10:59:58 +0000
committerbouyer <bouyer@NetBSD.org>2006-03-18 10:59:58 +0000
commitd3f24ba785cddf82b80d394852a044970bb6b2ae (patch)
tree7775c5af3a3c7daf8140536620798d1b51f1bb55 /sys/dev
parent216a33af30d98276cb3f772420c891b8af2872dd (diff)
__wdcwait_reset(): if we hare there we have a wdc pointer, so no need to check
if wdc is not NULL here at all (we were doing it after wdc has been dereferenced anyway). Coverity ID 2441.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/wdc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index f9a26fe8689..bb745d6c8da 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.235 2006/02/20 16:50:37 thorpej Exp $ */
+/* $NetBSD: wdc.c,v 1.236 2006/03/18 10:59:58 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.235 2006/02/20 16:50:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.236 2006/03/18 10:59:58 bouyer Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -1010,7 +1010,7 @@ __wdcwait_reset(struct ata_channel *chp, int drv_mask, int poll)
/* wait for BSY to deassert */
for (timeout = 0; timeout < nloop; timeout++) {
if ((drv_mask & 0x01) != 0) {
- if (wdc && wdc->select)
+ if (wdc->select)
wdc->select(chp,0);
bus_space_write_1(wdr->cmd_iot, wdr->cmd_iohs[wd_sdh],
0, WDSD_IBM); /* master */
@@ -1029,7 +1029,7 @@ __wdcwait_reset(struct ata_channel *chp, int drv_mask, int poll)
#endif
}
if ((drv_mask & 0x02) != 0) {
- if (wdc && wdc->select)
+ if (wdc->select)
wdc->select(chp,1);
bus_space_write_1(wdr->cmd_iot, wdr->cmd_iohs[wd_sdh],
0, WDSD_IBM | 0x10); /* slave */