From 0960a2028b3cf9b0a943ab72ab285b118eee954e Mon Sep 17 00:00:00 2001
From: Kyosti Malkki <kmalkki@cc.hut.fi>
Date: Wed, 9 Jun 1999 20:07:41 +0000
Subject: [PATCH] =?UTF-8?q?(Ky=C3=B6sti)=20=20=20SMBus=20over=20i2c=20"Rea?=
 =?UTF-8?q?d=20Word"=20bug=20fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Uh.. there was a '+' when it should have been '|'


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@479 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 kernel/smbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/smbus.c b/kernel/smbus.c
index de780cbb..dcb7e0e9 100644
--- a/kernel/smbus.c
+++ b/kernel/smbus.c
@@ -185,7 +185,7 @@ s32 smbus_access_i2c(struct i2c_adapter * adapter, u8 addr, char read_write,
       break;
     case SMBUS_WORD_DATA: 
     case SMBUS_PROC_CALL:
-      data->word = msgbuf1[0] + (msgbuf1[1] << 8);
+      data->word = msgbuf1[0] | (msgbuf1[1] << 8);
       break;
   }
   return 0;