diff options
Diffstat (limited to 'drivers/input/rmi4/rmi_f01.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_f01.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c index 8a07ae147df6..4edaa14fe878 100644 --- a/drivers/input/rmi4/rmi_f01.c +++ b/drivers/input/rmi4/rmi_f01.c | |||
| @@ -681,9 +681,9 @@ static int rmi_f01_resume(struct rmi_function *fn) | |||
| 681 | return 0; | 681 | return 0; |
| 682 | } | 682 | } |
| 683 | 683 | ||
| 684 | static int rmi_f01_attention(struct rmi_function *fn, | 684 | static irqreturn_t rmi_f01_attention(int irq, void *ctx) |
| 685 | unsigned long *irq_bits) | ||
| 686 | { | 685 | { |
| 686 | struct rmi_function *fn = ctx; | ||
| 687 | struct rmi_device *rmi_dev = fn->rmi_dev; | 687 | struct rmi_device *rmi_dev = fn->rmi_dev; |
| 688 | int error; | 688 | int error; |
| 689 | u8 device_status; | 689 | u8 device_status; |
| @@ -692,7 +692,7 @@ static int rmi_f01_attention(struct rmi_function *fn, | |||
| 692 | if (error) { | 692 | if (error) { |
| 693 | dev_err(&fn->dev, | 693 | dev_err(&fn->dev, |
| 694 | "Failed to read device status: %d.\n", error); | 694 | "Failed to read device status: %d.\n", error); |
| 695 | return error; | 695 | return IRQ_RETVAL(error); |
| 696 | } | 696 | } |
| 697 | 697 | ||
| 698 | if (RMI_F01_STATUS_BOOTLOADER(device_status)) | 698 | if (RMI_F01_STATUS_BOOTLOADER(device_status)) |
| @@ -704,11 +704,11 @@ static int rmi_f01_attention(struct rmi_function *fn, | |||
| 704 | error = rmi_dev->driver->reset_handler(rmi_dev); | 704 | error = rmi_dev->driver->reset_handler(rmi_dev); |
| 705 | if (error) { | 705 | if (error) { |
| 706 | dev_err(&fn->dev, "Device reset failed: %d\n", error); | 706 | dev_err(&fn->dev, "Device reset failed: %d\n", error); |
| 707 | return error; | 707 | return IRQ_RETVAL(error); |
| 708 | } | 708 | } |
| 709 | } | 709 | } |
| 710 | 710 | ||
| 711 | return 0; | 711 | return IRQ_HANDLED; |
| 712 | } | 712 | } |
| 713 | 713 | ||
| 714 | struct rmi_function_handler rmi_f01_handler = { | 714 | struct rmi_function_handler rmi_f01_handler = { |
