diff options
| author | Mark Brown <broonie@kernel.org> | 2017-10-19 19:45:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-10-19 19:45:49 +0100 |
| commit | c23fed1d9173bf85b0fca069c2f24771e2d4e546 (patch) | |
| tree | 8c0cddaea87050ba51cc209a2332ac03e3e3fabc /drivers/nvdimm | |
| parent | 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff) | |
| parent | f674bd281460451e8784f3bc917a650e8937a8ed (diff) | |
Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux into asoc-amd
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 1427a386a033..3e4d1e7998da 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -1417,6 +1417,15 @@ static int btt_claim_class(struct device *dev) struct nvdimm_drvdata *ndd = to_ndd(nd_mapping); struct nd_namespace_index *nsindex; + /* + * If any of the DIMMs do not support labels the only + * possible BTT format is v1. + */ + if (!ndd) { + loop_bitmask = 0; + break; + } + nsindex = to_namespace_index(ndd, ndd->ns_current); if (nsindex == NULL) loop_bitmask |= 1; |