From: Colin Finck Date: Sat, 12 Dec 2009 17:15:19 +0000 (+0000) Subject: Merge r44552 X-Git-Tag: ReactOS-0.3.11 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ed469a00afefe799500a59fabbf9c2b60ae745b4 Merge r44552 svn path=/branches/ros-branch-0_3_11/; revision=44553 --- diff --git a/reactos/drivers/storage/ide/uniata/id_ata.cpp b/reactos/drivers/storage/ide/uniata/id_ata.cpp index 4f8571b76d7..92be320f507 100644 --- a/reactos/drivers/storage/ide/uniata/id_ata.cpp +++ b/reactos/drivers/storage/ide/uniata/id_ata.cpp @@ -679,7 +679,7 @@ AtapiSoftReset( ) { //ULONG c = chan->lChannel; - ULONG i = 1000 * 1000; + ULONG i = 30 * 1000; UCHAR dma_status = 0; KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n")); UCHAR statusByte2;