From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Apr 2026 07:04:53 +0000 (+0200)
Subject: Merge tag 'v7.0-rc7' into char-misc-next
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5210135489ae7bc1ef1cb4a8157361dd7b468cd;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v7.0-rc7' into char-misc-next

We need the char/misc/iio/comedi fixes in here as well for testing

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

a5210135489ae7bc1ef1cb4a8157361dd7b468cd
diff --cc drivers/iio/adc/ti-ads1119.c
index 1157e606bc64a,79be71b4de963..2320be0efb508
--- a/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@@ -735,12 -738,11 +738,10 @@@ static int ads1119_probe(struct i2c_cli
  		return dev_err_probe(dev, ret, "Failed to setup IIO buffer\n");
  
  	if (client->irq > 0) {
- 		ret = devm_request_threaded_irq(dev, client->irq,
- 						ads1119_irq_handler,
- 						NULL, IRQF_ONESHOT,
- 						"ads1119", indio_dev);
+ 		ret = devm_request_irq(dev, client->irq, ads1119_irq_handler,
+ 				       IRQF_NO_THREAD, "ads1119", indio_dev);
  		if (ret)
 -			return dev_err_probe(dev, ret,
 -					     "Failed to allocate irq\n");
 +			return ret;
  
  		st->trig = devm_iio_trigger_alloc(dev, "%s-dev%d",
  						  indio_dev->name,