aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 21b3a767e7d7..7fddfe161795 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -119,7 +119,7 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)
119 drive->media = ide_disk; 119 drive->media = ide_disk;
120 drive->select.all = (unit<<4)|0xa0; 120 drive->select.all = (unit<<4)|0xa0;
121 drive->hwif = hwif; 121 drive->hwif = hwif;
122 drive->ready_stat = READY_STAT; 122 drive->ready_stat = ATA_DRDY;
123 drive->bad_wstat = BAD_W_STAT; 123 drive->bad_wstat = BAD_W_STAT;
124 drive->special.b.recalibrate = 1; 124 drive->special.b.recalibrate = 1;
125 drive->special.b.set_geometry = 1; 125 drive->special.b.set_geometry = 1;
@@ -884,7 +884,7 @@ MODULE_PARM_DESC(noprobe, "skip probing for a device");
884static unsigned int ide_nowerr; 884static unsigned int ide_nowerr;
885 885
886module_param_call(nowerr, ide_set_dev_param_mask, NULL, &ide_nowerr, 0); 886module_param_call(nowerr, ide_set_dev_param_mask, NULL, &ide_nowerr, 0);
887MODULE_PARM_DESC(nowerr, "ignore the WRERR_STAT bit for a device"); 887MODULE_PARM_DESC(nowerr, "ignore the ATA_DF bit for a device");
888 888
889static unsigned int ide_cdroms; 889static unsigned int ide_cdroms;
890 890
@@ -949,7 +949,7 @@ static void ide_dev_apply_params(ide_drive_t *drive)
949 drive->noprobe = 1; 949 drive->noprobe = 1;
950 } 950 }
951 if (ide_nowerr & (1 << i)) { 951 if (ide_nowerr & (1 << i)) {
952 printk(KERN_INFO "ide: ignoring the WRERR_STAT bit for %s\n", 952 printk(KERN_INFO "ide: ignoring the ATA_DF bit for %s\n",
953 drive->name); 953 drive->name);
954 drive->bad_wstat = BAD_R_STAT; 954 drive->bad_wstat = BAD_R_STAT;
955 } 955 }
@@ -970,7 +970,7 @@ static void ide_dev_apply_params(ide_drive_t *drive)
970 drive->cyl, drive->head, drive->sect); 970 drive->cyl, drive->head, drive->sect);
971 drive->present = 1; 971 drive->present = 1;
972 drive->media = ide_disk; 972 drive->media = ide_disk;
973 drive->ready_stat = READY_STAT; 973 drive->ready_stat = ATA_DRDY;
974 } 974 }
975} 975}
976 976