diff options
| author | James Bottomley | 2005-08-28 17:43:07 +0200 |
|---|---|---|
| committer | James Bottomley | 2005-08-28 17:43:07 +0200 |
| commit | 31151ba2cef171344beac254e65bd7e00138bb0d (patch) | |
| tree | a8f9cd3c0395656d974125c0ca7ed635aacddeee /drivers/ide/ide-disk.c | |
| parent | Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/... (diff) | |
| parent | [PATCH] ll_rw_blk.c kerneldoc updates (diff) | |
| download | kernel-qcow2-linux-31151ba2cef171344beac254e65bd7e00138bb0d.tar.gz kernel-qcow2-linux-31151ba2cef171344beac254e65bd7e00138bb0d.tar.xz kernel-qcow2-linux-31151ba2cef171344beac254e65bd7e00138bb0d.zip | |
fix mismerge in ll_rw_blk.c
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -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, 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 |