diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index d31117eb95aa..e4d55ad32d2f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block) | |||
1332 | if (cdrom_read_from_buffer(drive)) | 1332 | if (cdrom_read_from_buffer(drive)) |
1333 | return ide_stopped; | 1333 | return ide_stopped; |
1334 | 1334 | ||
1335 | blk_attempt_remerge(drive->queue, rq); | ||
1336 | |||
1337 | /* Clear the local sector buffer. */ | 1335 | /* Clear the local sector buffer. */ |
1338 | info->nsectors_buffered = 0; | 1336 | info->nsectors_buffered = 0; |
1339 | 1337 | ||
@@ -1874,14 +1872,6 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq) | |||
1874 | return ide_stopped; | 1872 | return ide_stopped; |
1875 | } | 1873 | } |
1876 | 1874 | ||
1877 | /* | ||
1878 | * for dvd-ram and such media, it's a really big deal to get | ||
1879 | * big writes all the time. so scour the queue and attempt to | ||
1880 | * remerge requests, often the plugging will not have had time | ||
1881 | * to do this properly | ||
1882 | */ | ||
1883 | blk_attempt_remerge(drive->queue, rq); | ||
1884 | |||
1885 | info->nsectors_buffered = 0; | 1875 | info->nsectors_buffered = 0; |
1886 | 1876 | ||
1887 | /* use dma, if possible. we don't need to check more, since we | 1877 | /* use dma, if possible. we don't need to check more, since we |