diff options
-rw-r--r-- | Documentation/hwmon/lm70 | 5 | ||||
-rw-r--r-- | drivers/hwmon/lm70.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70 index 0d240291e3cc..1bb1f20951ca 100644 --- a/Documentation/hwmon/lm70 +++ b/Documentation/hwmon/lm70 | |||
@@ -31,9 +31,8 @@ As a real (in-tree) example of this "SPI protocol driver" interfacing | |||
31 | with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c | 31 | with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c |
32 | and its associated documentation. | 32 | and its associated documentation. |
33 | 33 | ||
34 | The TMP121/TMP123 are very similar; main differences are 4 wire SPI inter- | 34 | The TMP121/TMP123 are very similar; main difference is 13-bit temperature |
35 | face (read only) and 13-bit temperature data (0.0625 degrees celsius reso- | 35 | data (0.0625 degrees celsius resolution). |
36 | lution). | ||
37 | 36 | ||
38 | Thanks to | 37 | Thanks to |
39 | --------- | 38 | --------- |
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index dd7f0cafd197..1da62f616db5 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c | |||
@@ -143,10 +143,6 @@ static int __devinit lm70_probe(struct spi_device *spi) | |||
143 | if (spi->mode & (SPI_CPOL | SPI_CPHA)) | 143 | if (spi->mode & (SPI_CPOL | SPI_CPHA)) |
144 | return -EINVAL; | 144 | return -EINVAL; |
145 | 145 | ||
146 | /* 3-wire link (shared SI/SO) for LM70 */ | ||
147 | if (chip == LM70_CHIP_LM70 && !(spi->mode & SPI_3WIRE)) | ||
148 | return -EINVAL; | ||
149 | |||
150 | /* NOTE: we assume 8-bit words, and convert to 16 bits manually */ | 146 | /* NOTE: we assume 8-bit words, and convert to 16 bits manually */ |
151 | 147 | ||
152 | p_lm70 = devm_kzalloc(&spi->dev, sizeof(*p_lm70), GFP_KERNEL); | 148 | p_lm70 = devm_kzalloc(&spi->dev, sizeof(*p_lm70), GFP_KERNEL); |