Skip to content

Commit 36fc543

Browse files
committed
Input: ads7846 - do not attempt IRQ workaround when deferring probe
When request_irq() returns -EPORBE_DEFER we should abort probe and try again later instead of trying to engage IRQ trigger workaround. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent ccd6613 commit 36fc543

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/input/touchscreen/ads7846.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,7 @@ static int ads7846_probe(struct spi_device *spi)
13611361
err = devm_request_threaded_irq(dev, spi->irq,
13621362
ads7846_hard_irq, ads7846_irq,
13631363
irq_flags, dev->driver->name, ts);
1364-
if (err && !pdata->irq_flags) {
1364+
if (err && err != -EPROBE_DEFER && !pdata->irq_flags) {
13651365
dev_info(dev,
13661366
"trying pin change workaround on irq %d\n", spi->irq);
13671367
irq_flags |= IRQF_TRIGGER_RISING;

0 commit comments

Comments
 (0)