]> www.infradead.org Git - nvme.git/commitdiff
ps3disk: Do not use dev->bounce_size before it is set
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 3 Jan 2025 08:51:25 +0000 (09:51 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 3 Jan 2025 18:44:25 +0000 (11:44 -0700)
dev->bounce_size is only initialized after it is used to set the queue
limits.  Fix this by using BOUNCE_SIZE instead.

Fixes: a7f18b74dbe17162 ("ps3disk: pass queue_limits to blk_mq_alloc_disk")
Reported-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Closes: https://lore.kernel.org/39256db9-3d73-4e86-a49b-300dfd670212@gmail.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/06988f959ea6885b8bd7fb3b9059dd54bc6bbad7.1735894216.git.geert+renesas@glider.be
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/ps3disk.c

index 68fed46c463e5aa983765e534a4225bc9e2377d4..dc9e4a14b8854587925abb47153af8cf0cee5f96 100644 (file)
@@ -384,9 +384,9 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)
        unsigned int devidx;
        struct queue_limits lim = {
                .logical_block_size     = dev->blk_size,
-               .max_hw_sectors         = dev->bounce_size >> 9,
+               .max_hw_sectors         = BOUNCE_SIZE >> 9,
                .max_segments           = -1,
-               .max_segment_size       = dev->bounce_size,
+               .max_segment_size       = BOUNCE_SIZE,
                .dma_alignment          = dev->blk_size - 1,
                .features               = BLK_FEAT_WRITE_CACHE |
                                          BLK_FEAT_ROTATIONAL,