From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Heiny Subject: [PATCH] input synaptics-rmi4: stop scanning PDT after blank page Date: Fri, 7 Mar 2014 18:04:16 -0800 Message-ID: <1394244256-16950-1-git-send-email-cheiny@synaptics.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from us-mx2.synaptics.com ([192.147.44.131]:18535 "EHLO us-mx2.synaptics.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751609AbaCHCEU (ORCPT ); Fri, 7 Mar 2014 21:04:20 -0500 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov Cc: Linux Input , Christopher Heiny , Andrew Duggan , Vincent Huang , Vivian Ly , Daniel Rosenberg , Linus Walleij , Benjamin Tissoires , David Herrmann , Jiri Kosina 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 Cc: Dmitry Torokhov Cc: Benjamin Tissoires Cc: Linux Walleij Cc: David Herrmann Cc: Jiri Kosina --- 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,