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

Merge branch 'acpi-sysfs' 

* acpi-sysfs:
  ACPI: sysfs: Prefer "compatible" modalias
parents 81b704d3 36af2d5c

drivers/acpi/device_sysfs.c

+6 −14
Original line number Diff line number Diff line
@@ -251,20 +251,12 @@ int __acpi_device_uevent_modalias(struct acpi_device *adev, 
	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;



	len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],

				  sizeof(env->buf) - env->buflen);

	if (len < 0)

		return len;



	env->buflen += len;

	if (!adev->data.of_compatible)

		return 0;



	if (len > 0 && add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;



	if (adev->data.of_compatible)

		len = create_of_modalias(adev, &env->buf[env->buflen - 1],

					 sizeof(env->buf) - env->buflen);

	else

		len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],

					  sizeof(env->buf) - env->buflen);

	if (len < 0)

		return len;