View | Details | Raw Unified | Return to bug 12646 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/w1/slaves/w1_therm.c (-3 / +2 lines)
Lines 115-123 static struct w1_therm_family_converter w1_therm_families[] = { Link Here
115 

          115
          

        

        

          116
          
static inline int w1_DS18B20_convert_temp(u8 rom[9])

          116
          
static inline int w1_DS18B20_convert_temp(u8 rom[9])

        

        

          117
          
{

          117
          
{

        

          
            

              118
              
	int t = ((s16)rom[1] << 8) | rom[0];


              118
              
	s16 t = le16_to_cpup((le16 *)rom);

            

            

              119
              
	t = t*1000/16;


              119
              
	return t*1000/16;

            

            

              120
              
	return t;


              
              
            

        

          121
          
}

          120
          
}

        

        

          122
          

          121
          

        

        

          123
          
static inline int w1_DS18S20_convert_temp(u8 rom[9])

          122
          
static inline int w1_DS18S20_convert_temp(u8 rom[9])

        






  

  Return to bug 12646