diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:31:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:31:27 -0400 |
| commit | 0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch) | |
| tree | 67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /drivers/ide | |
| parent | db400b3c4ee89d384d9163836a55577abdae772d (diff) | |
| parent | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index c9d3a00a3c0c..234f5de3e929 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -754,7 +754,7 @@ static int idedisk_issue_flush(request_queue_t *q, struct gendisk *disk, | |||
| 754 | 754 | ||
| 755 | idedisk_prepare_flush(q, rq); | 755 | idedisk_prepare_flush(q, rq); |
| 756 | 756 | ||
| 757 | ret = blk_execute_rq(q, disk, rq); | 757 | ret = blk_execute_rq(q, disk, rq, 0); |
| 758 | 758 | ||
| 759 | /* | 759 | /* |
| 760 | * if we failed and caller wants error offset, get it | 760 | * if we failed and caller wants error offset, get it |