Messages in this thread |  | | | Date | Thu, 5 Jul 2012 13:52:20 +1000 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the input-mt tree with the input-current tree |
| |
Hi Henrik,
Today's linux-next merge of the input-mt tree got a conflict in drivers/input/touchscreen/atmel_mxt_ts.c between commit 9b7e31bbf4bb ("Input: request threaded-only IRQs with IRQF_ONESHOT") from the input-current tree and commit c2ef9a1a248b ("Input: atmel_mxt_ts - use client name for irq") from the input-mt tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/input/touchscreen/atmel_mxt_ts.c index 25fd056,37190ab..0000000 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@@ -1144,13 -1167,8 +1167,9 @@@ static int __devinit mxt_probe(struct i input_set_drvdata(input_dev, data); i2c_set_clientdata(client, data); - error = mxt_initialize(data); - if (error) - goto err_free_object; error = request_threaded_irq(client->irq, NULL, mxt_interrupt, - pdata->irqflags, client->name, data); + pdata->irqflags | IRQF_ONESHOT, - client->dev.driver->name, data); ++ client->name, data); if (error) { dev_err(&client->dev, "Failed to register interrupt\n"); goto err_free_object;[unhandled content-type:application/pgp-signature] |  |