diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-09-13 08:39:09 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-09-13 08:39:09 -0600 |
| commit | d4d7c03f7ee1d7f16b7b6e885b1e00968f72b93c (patch) | |
| tree | d477f4a321ecb5da17ac69ce81943502f2a514ac /drivers/nvme/host/core.c | |
| parent | 26e197b7f9240a4ac301dd0ad520c0c697c2ea7d (diff) | |
| parent | 83bdfcbdbe5d901c5fa432decf12e1725a840a56 (diff) | |
| download | linux-d4d7c03f7ee1d7f16b7b6e885b1e00968f72b93c.tar.gz linux-d4d7c03f7ee1d7f16b7b6e885b1e00968f72b93c.tar.bz2 linux-d4d7c03f7ee1d7f16b7b6e885b1e00968f72b93c.zip | |
Merge tag 'nvme-6.12-2024-09-13' of git://git.infradead.org/nvme into for-6.12/block
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.12
- A syntax cleanup (Shen)
- Fix a Kconfig linking error (Arnd)
- New queue-depth quirk (Keith)"
* tag 'nvme-6.12-2024-09-13' of git://git.infradead.org/nvme:
nvme-pci: qdepth 1 quirk
nvme-tcp: fix link failure for TCP auth
nvme: Convert comma to semicolon
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 75ab62cb4aa4..1236e3aa00ed 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4605,7 +4605,7 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, set->flags = BLK_MQ_F_SHOULD_MERGE; if (ctrl->ops->flags & NVME_F_BLOCKING) set->flags |= BLK_MQ_F_BLOCKING; - set->cmd_size = cmd_size, + set->cmd_size = cmd_size; set->driver_data = ctrl; set->nr_hw_queues = ctrl->queue_count - 1; set->timeout = NVME_IO_TIMEOUT; |