Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jens Axboe <axboe@fb.com>

+1 -1
+1 -1
drivers/cdrom/gdrom.c
··· 602 602 spin_unlock(&gdrom_lock); 603 603 block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET; 604 604 block_cnt = blk_rq_sectors(req)/GD_TO_BLK; 605 - __raw_writel(virt_to_phys(req->buffer), GDROM_DMA_STARTADDR_REG); 605 + __raw_writel(virt_to_phys(bio_data(req->bio)), GDROM_DMA_STARTADDR_REG); 606 606 __raw_writel(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG); 607 607 __raw_writel(1, GDROM_DMA_DIRECTION_REG); 608 608 __raw_writel(1, GDROM_DMA_ENABLE_REG);