Re: [PATCH 2.6.11-rc2 17/29] ide: flagged_taskfile() tf_out_flags.b.select check

[Tejun Heo]

> 17_ide_flagged_taskfile_select_check.patch
> 
> 	In flagged_taskfile(), tf_out_flags.b.select should be checked
> 	before using bits inside taskfile->device_head.  When user
> 	haven't specified the select register, the default
> 	drive->select.all value should be used.


Signed-off-by: Tejun Heo <tj@xxxxxxxxxxx>


Index: linux-ide-export/drivers/ide/ide-taskfile.c
===================================================================
--- linux-ide-export.orig/drivers/ide/ide-taskfile.c	2005-02-02 10:28:05.273190003 +0900
+++ linux-ide-export/drivers/ide/ide-taskfile.c	2005-02-02 10:28:05.463159181 +0900
@@ -858,8 +858,12 @@ ide_startstop_t flagged_taskfile (ide_dr
 	 * select bit (master/slave) in the drive_head register. We must make
 	 * sure that the desired drive is selected.
 	 */
-	hwif->OUTB((taskfile->device_head & ~0x10) | drive->select.all,
-		   IDE_SELECT_REG);
+	if (task->tf_out_flags.b.select)
+		hwif->OUTB((taskfile->device_head & ~0x10) | drive->select.all,
+			   IDE_SELECT_REG);
+	else
+		hwif->OUTB(drive->select.all, IDE_SELECT_REG);
+ 
 	switch(task->data_phase) {
 
    	        case TASKFILE_OUT_DMAQ:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/