Changeset 2239

Timestamp:

01/22/04 02:05:49 (9 years ago)

Author:

mds

Message:

fix reservations being cancelled. Ticket 1515 and many others.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (2 diffs)
• kernel/chips/bmcsensors.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -25 +25 @@
   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
@@ -51 +53 @@
   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

lm-sensors/trunk/kernel/chips/bmcsensors.c

@@ -608 +608 @@
                 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);
@@ -626 +626 @@
 
                 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);