| Message ID | 1446766645-30350-1-git-send-email-aduggan@synaptics.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Nov 6, 2015 at 12:37 AM, Andrew Duggan <aduggan@synaptics.com> wrote: > From: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > If the device has been registered but is not populated, we should not > process any incoming interrupt. > Make sure the pointers we are following are valid. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > Tested-by: Andrew Duggan <aduggan@synaptics.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> This should just be squashed into the offending commit. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 05, 2015 at 03:37:25PM -0800, Andrew Duggan wrote: > From: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > If the device has been registered but is not populated, we should not > process any incoming interrupt. > Make sure the pointers we are following are valid. Why are the interrupts enabled when device is not ready? > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > Tested-by: Andrew Duggan <aduggan@synaptics.com> > --- > drivers/input/rmi4/rmi_driver.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c > index 2fdc7e8..fe5f2f9 100644 > --- a/drivers/input/rmi4/rmi_driver.c > +++ b/drivers/input/rmi4/rmi_driver.c > @@ -279,6 +279,9 @@ int rmi_process_interrupt_requests(struct rmi_device *rmi_dev) > struct rmi_function *entry; > int error; > > + if (!data || !data->f01_container || !data->irq_status) > + return 0; > + > error = rmi_read_block(rmi_dev, > data->f01_container->fd.data_base_addr + 1, > data->irq_status, data->num_of_irq_regs); > -- > 2.1.4 >
On Tue, Nov 10, 2015 at 12:16 AM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > On Thu, Nov 05, 2015 at 03:37:25PM -0800, Andrew Duggan wrote: >> From: Benjamin Tissoires <benjamin.tissoires@redhat.com> >> >> If the device has been registered but is not populated, we should not >> process any incoming interrupt. >> Make sure the pointers we are following are valid. > > Why are the interrupts enabled when device is not ready? Hmm... Yes, maybe this should have been tackled at the smbus level. Sorting this out might also help in the various suspend/resume bugs we are experiencing. Cheers, Benjamin > >> >> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> >> Tested-by: Andrew Duggan <aduggan@synaptics.com> >> --- >> drivers/input/rmi4/rmi_driver.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c >> index 2fdc7e8..fe5f2f9 100644 >> --- a/drivers/input/rmi4/rmi_driver.c >> +++ b/drivers/input/rmi4/rmi_driver.c >> @@ -279,6 +279,9 @@ int rmi_process_interrupt_requests(struct rmi_device *rmi_dev) >> struct rmi_function *entry; >> int error; >> >> + if (!data || !data->f01_container || !data->irq_status) >> + return 0; >> + >> error = rmi_read_block(rmi_dev, >> data->f01_container->fd.data_base_addr + 1, >> data->irq_status, data->num_of_irq_regs); >> -- >> 2.1.4 >> > > -- > Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 2fdc7e8..fe5f2f9 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -279,6 +279,9 @@ int rmi_process_interrupt_requests(struct rmi_device *rmi_dev) struct rmi_function *entry; int error; + if (!data || !data->f01_container || !data->irq_status) + return 0; + error = rmi_read_block(rmi_dev, data->f01_container->fd.data_base_addr + 1, data->irq_status, data->num_of_irq_regs);