| Message ID | 1394244256-16950-1-git-send-email-cheiny@synaptics.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 07, 2014 at 06:04:16PM -0800, Christopher Heiny wrote: > When scanning the Page Descriptor Table, the end of the PDT is marked by a > page where the first PDT entry is empty. Stop scanning when we find this > page. > > Signed-off-by: Christopher Heiny <cheiny@synaptics.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> > Cc: Linux Walleij <linus.walleij@linaro.org> > Cc: David Herrmann <dh.herrmann@gmail.com> > Cc: Jiri Kosina <jkosina@suse.cz> Applied, thank you. > > --- > drivers/input/rmi4/rmi_driver.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c > index 2172c80..dd3ccf5 100644 > --- a/drivers/input/rmi4/rmi_driver.c > +++ b/drivers/input/rmi4/rmi_driver.c > @@ -505,7 +505,8 @@ static int rmi_scan_pdt_page(struct rmi_device *rmi_dev, > return retval; > } > > - return data->f01_bootloader_mode ? RMI_SCAN_DONE : RMI_SCAN_CONTINUE; > + return (data->f01_bootloader_mode || addr == pdt_start) ? > + RMI_SCAN_DONE : RMI_SCAN_CONTINUE; > } > > static int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx,
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 2172c80..dd3ccf5 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -505,7 +505,8 @@ static int rmi_scan_pdt_page(struct rmi_device *rmi_dev, return retval; } - return data->f01_bootloader_mode ? RMI_SCAN_DONE : RMI_SCAN_CONTINUE; + return (data->f01_bootloader_mode || addr == pdt_start) ? + RMI_SCAN_DONE : RMI_SCAN_CONTINUE; } static int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx,
When scanning the Page Descriptor Table, the end of the PDT is marked by a page where the first PDT entry is empty. Stop scanning when we find this page. Signed-off-by: Christopher Heiny <cheiny@synaptics.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: Linux Walleij <linus.walleij@linaro.org> Cc: David Herrmann <dh.herrmann@gmail.com> Cc: Jiri Kosina <jkosina@suse.cz> --- drivers/input/rmi4/rmi_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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