Skip to content

Commit 1be128e

Browse files
authored
Merge pull request #175 from igaw/fix-tests
Fix tests
2 parents 5c204b1 + 7d14b6d commit 1be128e

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

src/nvme/ioctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ int nvme_set_features_timestamp(int fd, bool save, __u64 timestamp)
589589
.result = NULL,
590590
};
591591

592-
memcpy(&t, ts.timestamp, sizeof(ts.timestamp));
592+
memcpy(ts.timestamp, &t, sizeof(ts.timestamp));
593593
return nvme_set_features(&args);
594594
}
595595

src/nvme/tree.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ static int nvme_scan_topology(struct nvme_root *r, nvme_scan_filter_t f)
8686
if (!c) {
8787
nvme_msg(LOG_DEBUG, "failed to scan ctrl %s: %s\n",
8888
ctrls[i]->d_name, strerror(errno));
89+
continue;
8990
}
9091
if ((f) && !f(c->s)) {
9192
nvme_free_ctrl(c);

0 commit comments

Comments
 (0)