X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fide%2Flegacy%2Fpdc4030.c;h=0addbae1842250f35fbe890bcead00df1c1a56bd;hb=746550cff061581f89c687ada8523670768364f2;hp=802e1f64a93075ca3fba35e592762e7fae7d544e;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/drivers/ide/legacy/pdc4030.c b/drivers/ide/legacy/pdc4030.c
index 802e1f64a..0addbae18 100644
--- a/drivers/ide/legacy/pdc4030.c
+++ b/drivers/ide/legacy/pdc4030.c
@@ -282,8 +282,8 @@ int __init detect_pdc4030(ide_hwif_t *hwif)
 	hwif->OUTB(0xF3, IDE_SECTOR_REG);
 	hwif->OUTB(0x14, IDE_SELECT_REG);
 	hwif->OUTB(PROMISE_EXTENDED_COMMAND, IDE_COMMAND_REG);
-	
-	ide_delay_50ms();
+
+	msleep(50);
 
 	if (hwif->INB(IDE_ERROR_REG) == 'P' &&
 	    hwif->INB(IDE_NSECTOR_REG) == 'T' &&
@@ -756,12 +756,6 @@ static ide_startstop_t promise_rw_disk (ide_drive_t *drive, struct request *rq,
 
 	BUG_ON(rq->nr_sectors > 127);
 
-	if (!blk_fs_request(rq)) {
-		blk_dump_rq_flags(rq, "promise_rw_disk - bad command");
-		DRIVER(drive)->end_request(drive, 0, 0);
-		return ide_stopped;
-	}
-
 #ifdef DEBUG
 	printk(KERN_DEBUG "%s: %sing: LBAsect=%lu, sectors=%lu\n",
 			  drive->name, rq_data_dir(rq) ? "writ" : "read",