diff mbox

Input: elants_i2c - zero-extend hardware ID in firmware name

Message ID 20150418034336.GA31454@dtor-ws (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Torokhov April 18, 2015, 3:43 a.m. UTC
Let's zero-extend hardware id number when forming firmware file name,
to avoid kernel requesting firmware like "elants_i2c_   0.bin", which
is quite unexpected.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/touchscreen/elants_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Charlie Mooney April 20, 2015, 5:02 p.m. UTC | #1
On Fri, Apr 17, 2015 at 8:43 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Let's zero-extend hardware id number when forming firmware file name,
> to avoid kernel requesting firmware like "elants_i2c_   0.bin", which
> is quite unexpected.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/input/touchscreen/elants_i2c.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
> index 43b3c9c..0efd766 100644
> --- a/drivers/input/touchscreen/elants_i2c.c
> +++ b/drivers/input/touchscreen/elants_i2c.c
> @@ -699,7 +699,7 @@ static int elants_i2c_fw_update(struct elants_data *ts)
>         char *fw_name;
>         int error;
>
> -       fw_name = kasprintf(GFP_KERNEL, "elants_i2c_%4x.bin", ts->hw_version);
> +       fw_name = kasprintf(GFP_KERNEL, "elants_i2c_%04x.bin", ts->hw_version);
>         if (!fw_name)
>                 return -ENOMEM;
>
> --
> 2.2.0.rc0.207.ga3a616c
>
>
> --
> Dmitry

Looks good to me.

Acked-by: Charlie Mooney<charliemooney@chromium.org>
--
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
Benson Leung April 20, 2015, 7:27 p.m. UTC | #2
On Fri, Apr 17, 2015 at 8:43 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Let's zero-extend hardware id number when forming firmware file name,
> to avoid kernel requesting firmware like "elants_i2c_   0.bin", which
> is quite unexpected.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
diff mbox

Patch

diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 43b3c9c..0efd766 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -699,7 +699,7 @@  static int elants_i2c_fw_update(struct elants_data *ts)
 	char *fw_name;
 	int error;
 
-	fw_name = kasprintf(GFP_KERNEL, "elants_i2c_%4x.bin", ts->hw_version);
+	fw_name = kasprintf(GFP_KERNEL, "elants_i2c_%04x.bin", ts->hw_version);
 	if (!fw_name)
 		return -ENOMEM;