Commit 92a74ce3 authored by Young Xiao's avatar Young Xiao Committed by Andy Shevchenko

platform/x86: intel_menlow: avoid null pointer deference error

Fix a null pointer deference by acpi_driver_data() if device is
null (dereference before check). We should only set cdev and check
this is OK after we are sure device is not null.
Signed-off-by: default avatarYoung Xiao <92siuyang@gmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 8d4b2daf
...@@ -180,9 +180,13 @@ static int intel_menlow_memory_add(struct acpi_device *device) ...@@ -180,9 +180,13 @@ static int intel_menlow_memory_add(struct acpi_device *device)
static int intel_menlow_memory_remove(struct acpi_device *device) static int intel_menlow_memory_remove(struct acpi_device *device)
{ {
struct thermal_cooling_device *cdev = acpi_driver_data(device); struct thermal_cooling_device *cdev;
if (!device)
return -EINVAL;
if (!device || !cdev) cdev = acpi_driver_data(device);
if (!cdev)
return -EINVAL; return -EINVAL;
sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment