fix reservations being cancelled. Ticket 1515 and many others.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2239 7894878c-1315-0410-8ee3-d5d059ff63e0

CHANGES

@@ -24,6 +24,8 @@ ask CVS about it:
   File etc/sensors.conf.eg: Change it87 hyst to low
   Library: Better 2.6 eeprom support
            Change it87 hyst to low
+  Module bmcsensors: Fix reservations
+  Module eeprom: Remove memtype
   Program decode-vaio.pl: Add sysfs support
   Program mkpatch: Add max6650, lm83, lm90, asb100 and w83l785ts
                    Drop linux 2.2 support
@@ -50,6 +52,7 @@ ask CVS about it:
   Program fancontrol: Improvements, fixes, support 2.6 kernels
   Program mkpatch: Add lm75.h
   Program pwmconfig: Improvements, fixes, support 2.6 kernels
+  Program sensors: Add ASB100 support
   Program sensors-detect: Add 8712 Super I/O detection;
                           add W83L785TS detection
 

kernel/chips/bmcsensors.c

@@ -607,7 +607,7 @@ static void bmcsensors_rcv_msg(struct ipmi_msg *msg)
 	switch(state) {
 		case STATE_INIT:
 		case STATE_RESERVE:
-			resid = (((u16)msg->data[2]) << 8) || msg->data[1];
+			resid = (((u16)msg->data[2]) << 8) | msg->data[1];
 #ifdef DEBUG
 			printk(KERN_DEBUG "bmcsensors.o: Got first resid 0x%.4x\n", resid);
 #endif
@@ -625,7 +625,7 @@ static void bmcsensors_rcv_msg(struct ipmi_msg *msg)
 			break;
 
 		case STATE_UNCANCEL:
-			resid = (((u16)msg->data[2]) << 8) || msg->data[1];
+			resid = (((u16)msg->data[2]) << 8) | msg->data[1];
 #ifdef DEBUG
 			printk(KERN_DEBUG "bmcsensors.o: Got new resid 0x%.4x\n", resid);
 #endif