aboutsummaryrefslogtreecommitdiff
path: root/lib/sg_pt_linux.c
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2020-08-22 18:04:56 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2020-08-22 18:04:56 +0000
commite294cca49d78b88ed74f628353970ff907a77e05 (patch)
treeed2f495649bfdb4072c47e84b6cc9b455be4735c /lib/sg_pt_linux.c
parent936a3271c9f9d86c9592e1406bdd254341ff2849 (diff)
downloadsg3_utils-e294cca49d78b88ed74f628353970ff907a77e05.tar.gz
partial_clear_scsi_pt_obj() declared in sg_pt.h; testing directory work
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@861 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib/sg_pt_linux.c')
-rw-r--r--lib/sg_pt_linux.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/sg_pt_linux.c b/lib/sg_pt_linux.c
index 690abf82..d5e01e90 100644
--- a/lib/sg_pt_linux.c
+++ b/lib/sg_pt_linux.c
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-/* sg_pt_linux version 1.48 20200722 */
+/* sg_pt_linux version 1.49 20200820 */
#include <stdio.h>
@@ -486,16 +486,14 @@ partial_clear_scsi_pt_obj(struct sg_pt_base * vp)
return;
ptp->in_err = 0;
ptp->os_err = 0;
- if (ptp->nvme_our_sntl) {
- ptp->io_hdr.device_status = 0;
- ptp->io_hdr.transport_status = 0;
- ptp->io_hdr.driver_status = 0;
- ptp->io_hdr.din_xferp = 0;
- ptp->io_hdr.din_xfer_len = 0;
- ptp->io_hdr.dout_xferp = 0;
- ptp->io_hdr.dout_xfer_len = 0;
- } else
- ptp->nvme_result = 0;
+ ptp->io_hdr.device_status = 0;
+ ptp->io_hdr.transport_status = 0;
+ ptp->io_hdr.driver_status = 0;
+ ptp->io_hdr.din_xferp = 0;
+ ptp->io_hdr.din_xfer_len = 0;
+ ptp->io_hdr.dout_xferp = 0;
+ ptp->io_hdr.dout_xfer_len = 0;
+ ptp->nvme_result = 0;
}
#ifndef SG_SET_GET_EXTENDED
@@ -856,7 +854,7 @@ get_scsi_pt_status_response(const struct sg_pt_base * vp)
if (NULL == ptp)
return 0;
return (int)(ptp->nvme_our_sntl ? ptp->io_hdr.device_status :
- ptp->nvme_status);
+ ptp->nvme_status);
}
uint32_t