diff options
| -rw-r--r-- | drivers/iio/light/adjd_s311.c | 3 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c index 5f4749e60b04..c1cd5698b8ae 100644 --- a/drivers/iio/light/adjd_s311.c +++ b/drivers/iio/light/adjd_s311.c | |||
| @@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev, | |||
| 232 | 232 | ||
| 233 | switch (mask) { | 233 | switch (mask) { |
| 234 | case IIO_CHAN_INFO_RAW: | 234 | case IIO_CHAN_INFO_RAW: |
| 235 | ret = adjd_s311_read_data(indio_dev, chan->address, val); | 235 | ret = adjd_s311_read_data(indio_dev, |
| 236 | ADJD_S311_DATA_REG(chan->address), val); | ||
| 236 | if (ret < 0) | 237 | if (ret < 0) |
| 237 | return ret; | 238 | return ret; |
| 238 | return IIO_VAL_INT; | 239 | return IIO_VAL_INT; |
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index e25eba5713c1..b3b5125faa72 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c | |||
| @@ -482,7 +482,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
| 482 | ret = comedi_device_postconfig(dev); | 482 | ret = comedi_device_postconfig(dev); |
| 483 | if (ret < 0) { | 483 | if (ret < 0) { |
| 484 | comedi_device_detach(dev); | 484 | comedi_device_detach(dev); |
| 485 | module_put(dev->driver->module); | 485 | module_put(driv->module); |
| 486 | } | 486 | } |
| 487 | /* On success, the driver module count has been incremented. */ | 487 | /* On success, the driver module count has been incremented. */ |
| 488 | return ret; | 488 | return ret; |
