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

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

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

Pull staging/IIO fixes from Greg KH:
 "Here are a few small staging and IIO driver fixes for 4.18-rc3.

  Nothing major or big, all just fixes for reported problems since
  4.18-rc1. All of these have been in linux-next this week with no
  reported problems"

* tag 'staging-4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: android: ion: Return an ERR_PTR in ion_map_kernel
  staging: comedi: quatech_daqp_cs: fix no-op loop daqp_ao_insn_write()
  iio: imu: inv_mpu6050: Fix probe() failure on older ACPI based machines
  iio: buffer: fix the function signature to match implementation
  iio: mma8452: Fix ignoring MMA8452_INT_DRDY
  iio: tsl2x7x/tsl2772: avoid potential division by zero
  iio: pressure: bmp280: fix relative humidity unit
parents 652788a9 ebc2dc5f

drivers/iio/accel/mma8452.c

+1 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static irqreturn_t mma8452_interrupt(int irq, void *p) 
	if (src < 0)

		return IRQ_NONE;



	if (!(src & data->chip_info->enabled_events))

	if (!(src & (data->chip_info->enabled_events | MMA8452_INT_DRDY)))

		return IRQ_NONE;



	if (src & MMA8452_INT_DRDY) {

drivers/iio/imu/inv_mpu6050/inv_mpu_core.c

+2 −0
Original line number Diff line number Diff line
@@ -959,6 +959,8 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, 
	}



	irq_type = irqd_get_trigger_type(desc);

	if (!irq_type)

		irq_type = IRQF_TRIGGER_RISING;

	if (irq_type == IRQF_TRIGGER_RISING)

		st->irq_mask = INV_MPU6050_ACTIVE_HIGH;

	else if (irq_type == IRQF_TRIGGER_FALLING)

drivers/iio/light/tsl2772.c

+2 −0
Original line number Diff line number Diff line
@@ -582,6 +582,8 @@ static int tsl2772_als_calibrate(struct iio_dev *indio_dev) 
			"%s: failed to get lux\n", __func__);

		return lux_val;

	}

	if (lux_val == 0)

		return -ERANGE;



	ret = (chip->settings.als_cal_target * chip->settings.als_gain_trim) /

			lux_val;

drivers/iio/pressure/bmp280-core.c

+2 −3
Original line number Diff line number Diff line
@@ -415,10 +415,9 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2) 
	}

	comp_humidity = bmp280_compensate_humidity(data, adc_humidity);



	*val = comp_humidity;

	*val2 = 1024;

	*val = comp_humidity * 1000 / 1024;



	return IIO_VAL_FRACTIONAL;

	return IIO_VAL_INT;

}



static int bmp280_read_raw(struct iio_dev *indio_dev,

drivers/staging/android/ion/ion_heap.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap, 
	struct page **tmp = pages;



	if (!pages)

		return NULL;

		return ERR_PTR(-ENOMEM);



	if (buffer->flags & ION_FLAG_CACHED)

		pgprot = PAGE_KERNEL;