Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e1a6287 authored by Jens Axboe's avatar Jens Axboe
Browse files

gdrom: missed conversion from req->buffer 



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: default avatarJens Axboe <axboe@fb.com>
parent fb3ccb5d

drivers/cdrom/gdrom.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -602,7 +602,7 @@ static void gdrom_readdisk_dma(struct work_struct *work) 
		spin_unlock(&gdrom_lock);

		spin_unlock(&gdrom_lock);

		block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;

		block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;

		block_cnt = blk_rq_sectors(req)/GD_TO_BLK;

		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(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);

		__raw_writel(1, GDROM_DMA_DIRECTION_REG);

		__raw_writel(1, GDROM_DMA_DIRECTION_REG);

		__raw_writel(1, GDROM_DMA_ENABLE_REG);

		__raw_writel(1, GDROM_DMA_ENABLE_REG);