Author: akhaldi Date: Tue May 10 18:20:37 2016 New Revision: 71310 URL: http://svn.reactos.org/svn/reactos?rev=71310&view=rev Log: [0.4.1] Merge the uninitialized variable usage fix by Alter in r71309. CORE-11157
Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 10 18:20:37 2016 @@ -1 +1 @@ -/trunk:71217,71231,71245,71252,71255,71296 +/trunk:71217,71231,71245,71252,71255,71296,71309 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 10 18:20:37 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296 +/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309 Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp?rev=71310&r1=71309&r2=71310&view=diff ============================================================================== --- branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Tue May 10 18:20:37 2016 @@ -1538,7 +1538,7 @@ if(deviceExtension->DevID == ATA_I82371FB) { KdPrint2((PRINT_PREFIX " I82371FB\n")); USHORT reg4x; - USHORT control; + USHORT control=0; for(i=wdmamode; i>=0; i--) { idx = 5+i; if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { @@ -1559,9 +1559,9 @@ } GetPciConfig2(0x40+Channel*2, reg4x); if(apiomode > ATA_PIO0) { - control = 0x03; /* IORDY|TIME0 */ + control |= 0x03; /* IORDY|TIME0 */ } else { - control = 0x02; /* IORDY */ + control |= 0x02; /* IORDY */ } // if (ata_pio_need_iordy(adev)) //control |= 2; /* IE */