Merge branch 'for-6.1/wacom' into for-linus

[linux-block.git] / drivers / hid / wacom_sys.c

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 21612fdae9c3519ad804d32f933272b7f1e52b7f..634263e4556b03b0eeed3ec7df2cd1c9866de58f 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2221,7 +2221,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix)
                } else if (strstr(product_name, "Wacom") ||
                           strstr(product_name, "wacom") ||
                           strstr(product_name, "WACOM")) {
-                       strlcpy(name, product_name, sizeof(name));
+                       strscpy(name, product_name, sizeof(name));
                } else {
                        snprintf(name, sizeof(name), "Wacom %s", product_name);
                }
@@ -2239,7 +2239,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix)
                if (name[strlen(name)-1] == ' ')
                        name[strlen(name)-1] = '\0';
        } else {
-               strlcpy(name, features->name, sizeof(name));
+               strscpy(name, features->name, sizeof(name));
        }
 
        snprintf(wacom_wac->name, sizeof(wacom_wac->name), "%s%s",
@@ -2504,7 +2504,7 @@ static void wacom_wireless_work(struct work_struct *work)
                                goto fail;
                }
 
-               strlcpy(wacom_wac->name, wacom_wac1->name,
+               strscpy(wacom_wac->name, wacom_wac1->name,
                        sizeof(wacom_wac->name));
                error = wacom_initialize_battery(wacom);
                if (error)