Merge "input: sensors: fix proximity raw data not correct issue"

This commit is contained in:
Linux Build Service Account 2014-07-17 16:08:18 -07:00 committed by Gerrit - the friendly Code Review server
commit b9668a1e88

View file

@ -1623,7 +1623,10 @@ static ssize_t apds993x_show_pdata(struct device *dev,
int pdata;
mutex_lock(&data->update_lock);
pdata = i2c_smbus_read_word_data(client, CMD_WORD|APDS993X_PDATAL_REG);
pdata = i2c_smbus_read_word_data(client,
CMD_WORD|APDS993X_PDATAL_REG);
pdata |= i2c_smbus_read_word_data(client,
CMD_WORD|APDS993X_PDATAH_REG) << 8;
mutex_unlock(&data->update_lock);
return sprintf(buf, "%d\n", pdata);