diff options
| author | Christoph Hellwig | 2016-04-16 20:57:58 +0200 |
|---|---|---|
| committer | Jens Axboe | 2016-04-26 16:31:22 +0200 |
| commit | 76e3914ae51714b0535c38d9472d89124e0b6b96 (patch) | |
| tree | daf613373b0104990d92c84c28e8b6777eb600d2 /drivers/nvme/host/nvme.h | |
| parent | skd: remove broken discard support (diff) | |
| download | kernel-qcow2-linux-76e3914ae51714b0535c38d9472d89124e0b6b96.tar.gz kernel-qcow2-linux-76e3914ae51714b0535c38d9472d89124e0b6b96.tar.xz kernel-qcow2-linux-76e3914ae51714b0535c38d9472d89124e0b6b96.zip | |
nvme: fix cntlid type
Controller IDs in NVMe are unsigned 16-bit types. In the Fabrics driver we
actually pass ctrl->id by reference, so we need it to have the correct type.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/nvme.h')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 8e8fae8722f8..9b96e7586194 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -84,7 +84,7 @@ struct nvme_ctrl { char serial[20]; char model[40]; char firmware_rev[8]; - int cntlid; + u16 cntlid; u32 ctrl_config; |