fix mismerge in ll_rw_blk.c

2005-08-28 10:43:07 -05:00
parent 3d52acb342 73747aed04
commit 31151ba2ce
7 changed files with 400 additions and 104 deletions
--- 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,

 	idedisk_prepare_flush(q, rq);

-	ret = blk_execute_rq(q, disk, rq);
+	ret = blk_execute_rq(q, disk, rq, 0);

 	/*
 	 * if we failed and caller wants error offset, get it