diff options
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 7237e1547b1f..f85b7f21a617 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -315,12 +315,8 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, | |||
315 | break; | 315 | break; |
316 | } | 316 | } |
317 | 317 | ||
318 | if (sectors > 0) { | 318 | if (sectors > 0) |
319 | struct ide_driver *drv; | 319 | ide_end_request(drive, 1, sectors); |
320 | |||
321 | drv = *(struct ide_driver **)rq->rq_disk->private_data; | ||
322 | drv->end_request(drive, 1, sectors); | ||
323 | } | ||
324 | } | 320 | } |
325 | return ide_error(drive, s, stat); | 321 | return ide_error(drive, s, stat); |
326 | } | 322 | } |
@@ -337,13 +333,7 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) | |||
337 | return; | 333 | return; |
338 | } | 334 | } |
339 | 335 | ||
340 | if (rq->rq_disk) { | 336 | ide_end_request(drive, 1, rq->nr_sectors); |
341 | struct ide_driver *drv; | ||
342 | |||
343 | drv = *(struct ide_driver **)rq->rq_disk->private_data;; | ||
344 | drv->end_request(drive, 1, rq->nr_sectors); | ||
345 | } else | ||
346 | ide_end_request(drive, 1, rq->nr_sectors); | ||
347 | } | 337 | } |
348 | 338 | ||
349 | /* | 339 | /* |