lkml.org 
[lkml]   [2004]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] ide-taskfile.c fixups/cleanups [2/11]
    Date

    [PATCH] ide: end request fix for CONFIG_IDE_TASKFILE_IO=y PIO handlers

    ide_end_drive_cmd() should only be called for "flagged" taskfiles
    which have separate PIO handlers so use driver->end_request() instead.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

    linux-2.6.7-bzolnier/drivers/ide/ide-taskfile.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff -puN drivers/ide/ide-taskfile.c~ide_tf_end_fix drivers/ide/ide-taskfile.c
    --- linux-2.6.7/drivers/ide/ide-taskfile.c~ide_tf_end_fix 2004-06-19 02:41:30.203064168 +0200
    +++ linux-2.6.7-bzolnier/drivers/ide/ide-taskfile.c 2004-06-19 02:41:30.207063560 +0200
    @@ -586,7 +586,7 @@ check_status:
    return ide_stopped;
    /* Complete rq->buffer based request (ioctls). */
    if (!rq->bio && !rq->nr_sectors) {
    - ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
    + DRIVER(drive)->end_request(drive, 1, 0);
    return ide_stopped;
    }

    @@ -637,7 +637,7 @@ check_status:
    return ide_stopped;
    /* Complete rq->buffer based request (ioctls). */
    if (!rq->bio && !rq->nr_sectors) {
    - ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
    + DRIVER(drive)->end_request(drive, 1, 0);
    return ide_stopped;
    }

    @@ -703,7 +703,7 @@ ide_startstop_t task_out_intr (ide_drive
    return ide_stopped;
    /* Complete rq->buffer based request (ioctls). */
    if (!rq->bio && !rq->nr_sectors) {
    - ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
    + DRIVER(drive)->end_request(drive, 1, 0);
    return ide_stopped;
    }

    @@ -772,7 +772,7 @@ ide_startstop_t task_mulout_intr (ide_dr
    return ide_stopped;
    /* Complete rq->buffer based request (ioctls). */
    if (!rq->bio && !rq->nr_sectors) {
    - ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
    + DRIVER(drive)->end_request(drive, 1, 0);
    return ide_stopped;
    }

    _

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:03    [W:0.026 / U:29.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site