gdrom: missed conversion from req->buffer
authorJens Axboe <axboe@fb.com>
Wed, 16 Apr 2014 14:26:20 +0000 (08:26 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 16 Apr 2014 20:15:24 +0000 (14:15 -0600)
The friendly Intel kbuild test robot reported:

drivers/cdrom/gdrom.c: In function 'gdrom_readdisk_dma':
drivers/cdrom/gdrom.c:605:3: error: 'struct request' has no member named 'buffer'

Convert that from req->buffer to bio_data(rq->bio). Apparently
my grep missed this one, and I don't build for Sega Dreamcast
enough.

Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/cdrom/gdrom.c

index 51e75ad964223e07268e0781caa5fa9230f43824..584bc3126403d58955a915db2117fcd1d16de5a2 100644 (file)
@@ -602,7 +602,7 @@ static void gdrom_readdisk_dma(struct work_struct *work)
                spin_unlock(&gdrom_lock);
                block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;
                block_cnt = blk_rq_sectors(req)/GD_TO_BLK;
-               __raw_writel(virt_to_phys(req->buffer), GDROM_DMA_STARTADDR_REG);
+               __raw_writel(virt_to_phys(bio_data(req->bio)), GDROM_DMA_STARTADDR_REG);
                __raw_writel(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);
                __raw_writel(1, GDROM_DMA_DIRECTION_REG);
                __raw_writel(1, GDROM_DMA_ENABLE_REG);