Commit b483d3b8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pnp' 

Merge a PNP change for 6.6-rc1:

 - Fix string truncation warning in pnpacpi_add_device() (Sunil V L).

* pnp:
  PNP: ACPI: Fix string truncation warning
parents 56db6a8e 99c31bff

drivers/pnp/pnpacpi/core.c

+3 −0
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device) 
	else

		strncpy(dev->name, acpi_device_bid(device), sizeof(dev->name));



	/* Handle possible string truncation */

	dev->name[sizeof(dev->name) - 1] = '\0';



	if (dev->active)

		pnpacpi_parse_allocated_resource(dev);