From 2797e2b9652d58879341d37f99d68c4db73672fd Mon Sep 17 00:00:00 2001 From: Hans Rosenfeld Date: Thu, 19 Nov 2015 16:27:07 +0100 Subject: [PATCH] 6467 nvme version number check is broken Reviewed by: Dan McDonald Reviewed by: Toomas Soome Reviewed by: Garrett D'Amore Approved by: Robert Mustacchi --- usr/src/uts/common/io/nvme/nvme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr/src/uts/common/io/nvme/nvme.c b/usr/src/uts/common/io/nvme/nvme.c index 9b77410470..c548a1ed92 100644 --- a/usr/src/uts/common/io/nvme/nvme.c +++ b/usr/src/uts/common/io/nvme/nvme.c @@ -1761,8 +1761,9 @@ nvme_init(nvme_t *nvme) dev_err(nvme->n_dip, CE_CONT, "?NVMe spec version %d.%d", vs.b.vs_mjr, vs.b.vs_mnr); - if (nvme_version_major < vs.b.vs_mjr && - nvme_version_minor < vs.b.vs_mnr) { + if (nvme_version_major < vs.b.vs_mjr || + (nvme_version_major == vs.b.vs_mjr && + nvme_version_minor < vs.b.vs_mnr)) { dev_err(nvme->n_dip, CE_WARN, "!no support for version > %d.%d", nvme_version_major, nvme_version_minor); if (nvme->n_strict_version) -- 2.11.4.GIT