X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpower%2Fbq27x00_battery.c;h=0c056fcc01ce540b7e3ac3c6f27c52d6a6a9c0b6;hb=8aef7e8f8de2d900da892085edbf14ea35fe6881;hp=62d4948e82067271a05005c9d631568505e115c1;hpb=6a9037887ccea92152b034edeb15d453d1a98555;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 62d4948e820..0c056fcc01c 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/idr.h>
-
 #include <linux/i2c.h>
+#include <asm/unaligned.h>
 
 #define DRIVER_VERSION			"1.0.0"
 
@@ -33,7 +33,6 @@
 #define BQ27x00_REG_RSOC		0x0B /* Relative State-of-Charge */
 #define BQ27x00_REG_AI			0x14
 #define BQ27x00_REG_FLAGS		0x0A
-#define HIGH_BYTE(A)			((A) << 8)
 
 /* If the system has several batteries we need a different name for each
  * of them...
@@ -239,7 +238,7 @@ static int bq27200_read(u8 reg, int *rt_value, int b_single,
 		err = i2c_transfer(client->adapter, msg, 1);
 		if (err >= 0) {
 			if (!b_single)
-				*rt_value = data[1] | HIGH_BYTE(data[0]);
+				*rt_value = get_unaligned_be16(data);
 			else
 				*rt_value = data[0];