diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:43:07 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:43:07 -0400 |
| commit | 31151ba2cef171344beac254e65bd7e00138bb0d (patch) | |
| tree | a8f9cd3c0395656d974125c0ca7ed635aacddeee /drivers/ide | |
| parent | 3d52acb34247816c453f94596e6c7fc4499b76dc (diff) | |
| parent | 73747aed04d3b3fb694961d025f81863b99c6898 (diff) | |
fix mismerge in ll_rw_blk.c
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 |