Merge branch 'acpi-fixes' (49a9e431) · Commits · e / devices / android_kernel_teracube_2e

drivers/acpi/scan.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1785,7 +1785,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
		acpi_set_pnp_ids(handle, &pnp, type);

		if (!pnp.type.hardware_id)
		return;
		goto out;

		/*
		* This relies on the fact that acpi_install_notify_handler() will not
		@@ -1800,6 +1800,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
		}
		}

		out:
		acpi_free_pnp_ids(&pnp);
		}