aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Thelin <Timothy.Thelin@wdc.com>2005-09-16 22:28:16 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-17 14:50:03 -0400
commitef0f6a437f92fbd96c725086555b37b29371e107 (patch)
tree3ae8e3541ae7f150d7f2c5e08be8af96737c7d2e
parent9564df1ff3c61f41bdc54283715417ccdfb6782b (diff)
[PATCH] ide: fix null request pointer for taskfile ioctl
When doing ioctl HDIO_DRIVE_TASKFILE, the ide_task_t's request pointer is never set, but flagged_taskfile and do_rw_taskfile pass it as a parameter to the prehandler. The kernel will oops taskfile pio-out commands because of this (taskfile pio-in doesn't use a prehandler). This fix sets the request pointer at the time the request is created to stop this oops. Signed-off-by: Timothy Thelin <timothy.thelin@wdc.com> Cc: "Bartlomiej Zolnierkiewicz" <bzolnier@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ide/ide-taskfile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index d04f62ab5de1..ace8edad6e96 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -500,6 +500,7 @@ static int ide_diag_taskfile(ide_drive_t *drive, ide_task_t *args, unsigned long
500 } 500 }
501 501
502 rq.special = args; 502 rq.special = args;
503 args->rq = &rq;
503 return ide_do_drive_cmd(drive, &rq, ide_wait); 504 return ide_do_drive_cmd(drive, &rq, ide_wait);
504} 505}
505 506