From: Greg Kroah-Hartman Date: Wed, 7 Apr 2010 16:25:26 +0000 (-0700) Subject: bugfix for queue-2.6.32/lis3-fix-show-rate-for-8-bits-chips.patch X-Git-Tag: v2.6.32.12~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a29dcbffbd2b01ce94d2371e2cee965fec7d0031;p=thirdparty%2Fkernel%2Fstable-queue.git bugfix for queue-2.6.32/lis3-fix-show-rate-for-8-bits-chips.patch --- diff --git a/queue-2.6.32/lis3-fix-show-rate-for-8-bits-chips.patch b/queue-2.6.32/lis3-fix-show-rate-for-8-bits-chips.patch index 30e2596d67d..9f460052c9e 100644 --- a/queue-2.6.32/lis3-fix-show-rate-for-8-bits-chips.patch +++ b/queue-2.6.32/lis3-fix-show-rate-for-8-bits-chips.patch @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman - lis3->read(lis3, CTRL_REG2, ®); - reg |= CTRL2_BDU; - lis3->write(lis3, CTRL_REG2, reg); -+ if (lis3->whoami == WAI_12B) { ++ if (lis3->whoami == LIS_DOUBLE_ID) { + lis3->read(lis3, CTRL_REG2, ®); + reg |= CTRL2_BDU; + lis3->write(lis3, CTRL_REG2, reg); @@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman - val = (ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4; - return sprintf(buf, "%d\n", lis3lv02dl_df_val[val]); + -+ if (lis3_dev.whoami == WAI_12B) ++ if (lis3_dev.whoami == LIS_DOUBLE_ID) + val = lis3_12_rates[(ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4]; + else + val = lis3_8_rates[(ctrl & CTRL1_DR) >> 7];