diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/hwmon/adt7310.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/hwmon/adt7310.c')
| -rw-r--r-- | drivers/hwmon/adt7310.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c index 5994cf6..da5f078 100644 --- a/drivers/hwmon/adt7310.c +++ b/drivers/hwmon/adt7310.c @@ -42,8 +42,13 @@ static const u8 adt7310_reg_table[] = { static int adt7310_spi_read_word(struct device *dev, u8 reg) { struct spi_device *spi = to_spi_device(dev); + int ret; - return spi_w8r16be(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); + ret = spi_w8r16(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); + if (ret < 0) + return ret; + + return be16_to_cpu((__force __be16)ret); } static int adt7310_spi_write_word(struct device *dev, u8 reg, u16 data) |