diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index cb97b6105f5286fa6c11c8bf787a3e1b49baf52c..ac426905e7eeac54fc7e26d2cae2b97aa2eb2806 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -448,7 +448,7 @@ static int extract_package(struct acpi_battery *battery,
 			u8 *ptr = (u8 *)battery + offsets[i].offset;
 			if (element->type == ACPI_TYPE_STRING ||
 			    element->type == ACPI_TYPE_BUFFER)
-				strncpy(ptr, element->string.pointer, 32);
+				strscpy(ptr, element->string.pointer, 32);
 			else if (element->type == ACPI_TYPE_INTEGER) {
 				strncpy(ptr, (u8 *)&element->integer.value,
 					sizeof(u64));