diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 11:23:35 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 11:23:35 +0300 |
| commit | 5b929bd11df23922daf1be5d52731cc3900c1d79 (patch) | |
| tree | 105fa5987b03c9f4e0260a9eb04dff7bb3d16839 /drivers/nvdimm/region_devs.c | |
| parent | b2c51106c7581866c37ffc77c5d739f3d4b7cbc9 (diff) | |
| parent | 37868fe113ff2ba814b3b4eb12df214df555f8dc (diff) | |
| download | linux-5b929bd11df23922daf1be5d52731cc3900c1d79.tar.xz | |
Merge branch 'x86/urgent' into x86/asm, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvdimm/region_devs.c')
| -rw-r--r-- | drivers/nvdimm/region_devs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index a5233422f9dc..7384455792bf 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -458,10 +458,15 @@ static void nd_region_notify_driver_action(struct nvdimm_bus *nvdimm_bus, nvdimm_bus_unlock(dev); } if (is_nd_btt(dev) && probe) { + struct nd_btt *nd_btt = to_nd_btt(dev); + nd_region = to_nd_region(dev->parent); nvdimm_bus_lock(dev); if (nd_region->btt_seed == dev) nd_region_create_btt_seed(nd_region); + if (nd_region->ns_seed == &nd_btt->ndns->dev && + is_nd_blk(dev->parent)) + nd_region_create_blk_seed(nd_region); nvdimm_bus_unlock(dev); } } |