Changeset 4276

Show
Ignore:
Timestamp:
01/02/07 19:35:41 (7 years ago)
Author:
khali
Message:

bmcsensors: Fix several compilation warnings.

Location:
lm-sensors/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/trunk/CHANGES

    r4270 r4276  
    1717  Man page i2cdetect.8: Describe the output convention 
    1818  Man page sensors.1: Update (option -c) and clean up 
     19  Module bmcsensors: Fix several warnings 
    1920  Module i2c-i801: Add ICH9 support 
    2021  Module f71805f: Fix the device address decoding (2.6 backport) 
  • lm-sensors/trunk/kernel/chips/bmcsensors.c

    r3024 r4276  
    3737#define DEBUG 1 
    3838*/ 
    39  
    40 static unsigned short normal_i2c[] = { SENSORS_I2C_END }; 
    41 static unsigned short normal_i2c_range[] = { SENSORS_I2C_END }; 
    42 static unsigned int normal_isa[] = { SENSORS_ISA_END }; 
    43 static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; 
    44  
    45 SENSORS_INSMOD_1(bmcsensors); 
    4639 
    4740struct bmcsensors_data { 
     
    219212                        for(i = 0; i < length; i += 3) { 
    220213                                *to++ = *from & 0x3f; 
    221                                 *to++ = *from++ >> 6 | ((*from & 0xf)  << 2); 
    222                                 *to++ = *from++ >> 4 | ((*from & 0x3)  << 4); 
     214                                *to++ = *from >> 6 | ((*(from+1) & 0xf)  << 2); 
     215                                from++; 
     216                                *to++ = *from >> 4 | ((*(from+1) & 0x3)  << 4); 
     217                                from++; 
    223218                                *to++ = (*from++ >> 2) & 0x3f; 
    224219                        } 
     
    299294 
    300295        /* swap lim1/lim2 if m < 0 or function is 1/x (but not both!) */ 
    301         if(sd->m < 0 && sd->linear != 7 || sd->m >= 0 && sd->linear == 7) { 
     296        if((sd->m < 0 && sd->linear != 7) || (sd->m >= 0 && sd->linear == 7)) { 
    302297                tmp = sd->lim1; 
    303298                sd->lim1 = sd->lim2;