diff options
| author | Jens Axboe <axboe@fb.com> | 2014-04-16 16:26:20 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-16 22:15:24 +0200 |
| commit | 8e1a6287d950ca386a738ff2043b3e2252fc0e76 (patch) | |
| tree | e6a565133e91097516157ce7b361571a5e9d26c6 /drivers/cdrom | |
| parent | block: all blk-mq requests are tagged (diff) | |
| download | linux-8e1a6287d950ca386a738ff2043b3e2252fc0e76.tar.xz linux-8e1a6287d950ca386a738ff2043b3e2252fc0e76.zip | |
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>
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/gdrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 51e75ad96422..584bc3126403 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -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); |