NVMe: Merge issue on character device bring-up
authorKeith Busch <keith.busch@intel.com>
Thu, 5 Sep 2013 20:45:07 +0000 (14:45 -0600)
committerMatthew Wilcox <matthew.r.wilcox@intel.com>
Fri, 6 Sep 2013 20:26:58 +0000 (16:26 -0400)
commitd82e8bfdef9afae83b894be49af4644d9ac3c359
treeb9d26d4e24e5464fe845110ad6bbed44650ded9c
parent9d713c2bfb5e1d6abb18a8b12293631f9fcdc708
NVMe: Merge issue on character device bring-up

A recent patch made it possible to bring up the character handle when the
device is responsive but not accepting a set-features command. Another
recent patch moved the initialization that requires we move where the
checks for this condition occur. This patch merges these two ideas so
it works much as before.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
drivers/block/nvme-core.c