nvme-pci: Don't disable on timeout in reset state

mainline inclusion
from mainline-5.2-rc2
commit 39a9dd81
category: bugfix
bugzilla: 167363
CVE: NA

---------------------------

The reset state doesn't dispatch commands that it needs to wait for
anymore. If a timeout occurs in this state, the reset work is already
disabling the controller, so just reset the request's timer.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>

Conflicts:
	drivers/nvme/host/pci.c
	[ Cleanup patch 3b7dffb9("nvme-pci: mark expected switch
	  fall-through") not applied. ]

Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>