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

Collapse All | Expand All

(-)a/drivers/acpi/x86/utils.c (-2 / +18 lines)
Lines 207-215 static const struct x86_cpu_id storage_d3_cpu_ids[] = { Link Here
207
	{}
207
	{}
208
};
208
};
209
209
210
static const struct dmi_system_id force_storage_d3_dmi[] = {
211
	{
212
		/*
213
		 * _ADR is ambiguous between GPP1.DEV0 and GPP1.NVME
214
		 * but .NVME is needed to get StorageD3Enable node
215
		 * https://bugzilla.kernel.org/show_bug.cgi?id=216440
216
		 */
217
		.matches = {
218
			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
219
			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 14 7425 2-in-1"),
220
		}
221
	},
222
	{}
223
};
224
210
bool force_storage_d3(void)
225
bool force_storage_d3(void)
211
{
226
{
212
	return x86_match_cpu(storage_d3_cpu_ids);
227
	const struct dmi_system_id *dmi_id = dmi_first_match(force_storage_d3_dmi);
228
229
	return dmi_id || x86_match_cpu(storage_d3_cpu_ids);
213
}
230
}
214
231
215
/*
232
/*
216
- 

Return to bug 216440