Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1c008cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging fixes from Greg KH:
 "Here are two tiny staging tree fixes (well, one is for an iio driver,
  but those updates come through the staging tree due to dependancies)

  One fixes a problem with an IIO driver, and the other fixes a bug in
  the comedi driver core"

* tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: comedi: bug-fix NULL pointer dereference on failed attach
  iio: adjd_s311: Fix non-scan mode data read
parents 5e25e4f3 3955dfa8

drivers/iio/light/adjd_s311.c

+2 −1
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev, 


	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		ret = adjd_s311_read_data(indio_dev, chan->address, val);

		ret = adjd_s311_read_data(indio_dev,

			ADJD_S311_DATA_REG(chan->address), val);

		if (ret < 0)

			return ret;

		return IIO_VAL_INT;

drivers/staging/comedi/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		ret = comedi_device_postconfig(dev);

	if (ret < 0) {

		comedi_device_detach(dev);

		module_put(dev->driver->module);

		module_put(driv->module);

	}

	/* On success, the driver module count has been incremented. */

	return ret;