| From 5e0c1b3b7f26eab63471ab8c2591565b1063c6c3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 20 Feb 2020 00:59:36 +0900 |
| Subject: nvme: Fix uninitialized-variable warning |
| |
| From: Keith Busch <kbusch@kernel.org> |
| |
| [ Upstream commit 15755854d53b4bbb0bb37a0fce66f0156cfc8a17 ] |
| |
| gcc may detect a false positive on nvme using an unintialized variable |
| if setting features fails. Since this is not a fast path, explicitly |
| initialize this variable to suppress the warning. |
| |
| Reported-by: Arnd Bergmann <arnd@arndb.de> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Keith Busch <kbusch@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/nvme/host/core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c |
| index ada59df642d29..a4d8c90ee7cc4 100644 |
| --- a/drivers/nvme/host/core.c |
| +++ b/drivers/nvme/host/core.c |
| @@ -1165,8 +1165,8 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, |
| static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid, |
| unsigned int dword11, void *buffer, size_t buflen, u32 *result) |
| { |
| + union nvme_result res = { 0 }; |
| struct nvme_command c; |
| - union nvme_result res; |
| int ret; |
| |
| memset(&c, 0, sizeof(c)); |
| -- |
| 2.20.1 |
| |