summaryrefslogtreecommitdiffstats
path: root/sbin/camcontrol
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>2001-12-05 03:41:40 +0000
committerken <ken@FreeBSD.org>2001-12-05 03:41:40 +0000
commit12f8fd8d1c64e7d9f426a5a99cbcd4155b24de77 (patch)
tree238dae4cb29ce3acdf02afe554c19998b0e5c333 /sbin/camcontrol
parent636727a3bb85252f83266d44880785b573885c41 (diff)
downloadFreeBSD-src-12f8fd8d1c64e7d9f426a5a99cbcd4155b24de77.zip
FreeBSD-src-12f8fd8d1c64e7d9f426a5a99cbcd4155b24de77.tar.gz
Fix breakage in 'camcontrol defects' introduced in rev 1.34 (the new error
recovery code) back in March, 2001. In effect, this brain-o would cause 'camcontrol defects' to always return an error. Pointed out by: joerg Tested by: mdodd
Diffstat (limited to 'sbin/camcontrol')
-rw-r--r--sbin/camcontrol/camcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index c82ef8b..6fb034f 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1998, 1999, 2000 Kenneth D. Merry
+ * Copyright (c) 1997, 1998, 1999, 2000, 2001 Kenneth D. Merry
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1291,7 +1291,7 @@ readdefects(struct cam_device *device, int argc, char **argv,
CAM_EPF_ALL, stderr);
goto defect_bailout;
}
- } else {
+ } else if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
error = 1;
warnx("Error returned from read defect data command");
if (arglist & CAM_ARG_VERBOSE)
OpenPOWER on IntegriCloud