---

yaml --- r: 71742 b: refs/heads/master c: b515da8 h: refs/heads/master v: v3
git-mirror · Oct 19, 2007 · 5aeeaea · 5aeeaea
1 parent 9895b98
commit 5aeeaea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 746f312a5606bbfc616a16f830705ec8cb54ab9a
+refs/heads/master: b515da89c6f4d3c3c2a19358ce0304046c043ea1
diff --git a/trunk/drivers/ide/pci/serverworks.c b/trunk/drivers/ide/pci/serverworks.c
@@ -158,13 +158,6 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 	u8 ultra_enable	 = 0, ultra_timing = 0, dma_timing = 0;
 
-	/* If we are about to put a disk into UDMA mode we screwed up.
-	   Our code assumes we never _ever_ do this on an OSB4 */
-
-	if(dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4 &&
-		drive->media == ide_disk && speed >= XFER_UDMA_0)
-			BUG();
-
 	pci_read_config_byte(dev, (0x56|hwif->channel), &ultra_timing);
 	pci_read_config_byte(dev, 0x54, &ultra_enable);