View | Details | Raw Unified | Return to bug 15605 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/acpi/scan.c (-6 / +6 lines)
Lines 1044-1055 static void acpi_device_set_id(struct acpi_device *device) Link Here
1044
		if (ACPI_IS_ROOT_DEVICE(device)) {
1044
		if (ACPI_IS_ROOT_DEVICE(device)) {
1045
			acpi_add_id(device, ACPI_SYSTEM_HID);
1045
			acpi_add_id(device, ACPI_SYSTEM_HID);
1046
			break;
1046
			break;
1047
		} else if (ACPI_IS_ROOT_DEVICE(device->parent)) {
1048
			/* \_SB_, the only root-level namespace device */
1049
			acpi_add_id(device, ACPI_BUS_HID);
1050
			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
1051
			strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
1052
			break;
1053
		}
1047
		}
1054
1048
1055
		status = acpi_get_object_info(device->handle, &info);
1049
		status = acpi_get_object_info(device->handle, &info);
Lines 1082-1087 static void acpi_device_set_id(struct acpi_device *device) Link Here
1082
			acpi_add_id(device, ACPI_BAY_HID);
1076
			acpi_add_id(device, ACPI_BAY_HID);
1083
		else if (ACPI_SUCCESS(acpi_dock_match(device)))
1077
		else if (ACPI_SUCCESS(acpi_dock_match(device)))
1084
			acpi_add_id(device, ACPI_DOCK_HID);
1078
			acpi_add_id(device, ACPI_DOCK_HID);
1079
		else if (!acpi_device_hid(device) &&
1080
			 ACPI_IS_ROOT_DEVICE(device->parent)) {
1081
			acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
1082
			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
1083
			strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
1084
		}
1085
1085
1086
		break;
1086
		break;
1087
	case ACPI_BUS_TYPE_POWER:
1087
	case ACPI_BUS_TYPE_POWER:

Return to bug 15605