diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-02-21 09:18:00 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-02-21 09:18:00 -0700 |
| commit | ae7bbc091351a4c6ebddfbe36eb5eb7a149cd7a2 (patch) | |
| tree | cd8829335a71ad2dc9813b02f7353980986a80b0 /drivers/nvme/host/core.c | |
| parent | f25372ffc3f6c2684b57fb718219137e6ee2b64c (diff) | |
| parent | 3b7830904e17202524bad1974505a9bfc718d31f (diff) | |
Merge branch 'nvme-5.6-rc3' of git://git.infradead.org/nvme into block-5.6block-5.6-2020-02-22
Pull NVMe fixes from Keith.
* 'nvme-5.6-rc3' of git://git.infradead.org/nvme:
nvme-multipath: Fix memory leak with ana_log_buf
nvme: Fix uninitialized-variable warning
nvme-pci: Use single IRQ vector for old Apple models
nvme/pci: Add sleep quirk for Samsung and Toshiba drives
Diffstat (limited to 'drivers/nvme/host/core.c')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index ada59df642d2..a4d8c90ee7cc 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)); |