From f1a4aa601cfe0689cedc77cbc01abf02a276bee1 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 1 Apr 2010 15:55:02 -0700 Subject: tegra: Fixed error module bond-out index calculation Fixed an incorrect calculation for skipping to the next byte of bond-out information. Bailing out of a byte early would result in an incorrect offset being used for subsequent module ids resulting in incorrect modules being marked as bonded out. Change-Id: Ia5cb449006c2d3b825097c852c21f4e1346e6696 Reviewed-on: http://git-master/r/1024 Reviewed-by: Scott Williams Reviewed-by: Gary King Tested-by: Gary King --- arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_misc.c b/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_misc.c index 54ac28bfd1f7..97835ad98399 100644 --- a/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_misc.c +++ b/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_misc.c @@ -267,7 +267,7 @@ NvRmPrivAp15BasicReset( NvRmDeviceHandle rm ) { /* * For peripheral modules that are not taken from reset, yet, - * use oscillator as a safe clock + * use oscillator as a safe clock */ NVRM_SET_OSC_CLOCK(I2S1, I2S1, L); NVRM_SET_OSC_CLOCK(I2S2, I2S2, L); @@ -498,7 +498,7 @@ NvRmPrivCheckBondOut( NvRmDeviceHandle hDevice ) val = val >> 1; // Use ARM's clz? if ( !val ) { - i = (i + 7) & ~7; // skip till next byte + i = (i + 8) & ~7; // skip to next byte break; } i++; -- cgit v1.2.3