Merge branch 'acpi-scan'

* acpi-scan:
ACPI / scan: Fix NULL pointer dereference in acpi_companion_match()

+4 -2
+4 -2
drivers/acpi/scan.c
··· 247 static struct acpi_device *acpi_companion_match(const struct device *dev) 248 { 249 struct acpi_device *adev; 250 251 adev = ACPI_COMPANION(dev); 252 if (!adev) ··· 256 if (list_empty(&adev->pnp.ids)) 257 return NULL; 258 259 - mutex_lock(&adev->physical_node_lock); 260 if (list_empty(&adev->physical_node_list)) { 261 adev = NULL; 262 } else { ··· 268 if (node->dev != dev) 269 adev = NULL; 270 } 271 - mutex_unlock(&adev->physical_node_lock); 272 273 return adev; 274 }
··· 247 static struct acpi_device *acpi_companion_match(const struct device *dev) 248 { 249 struct acpi_device *adev; 250 + struct mutex *physical_node_lock; 251 252 adev = ACPI_COMPANION(dev); 253 if (!adev) ··· 255 if (list_empty(&adev->pnp.ids)) 256 return NULL; 257 258 + physical_node_lock = &adev->physical_node_lock; 259 + mutex_lock(physical_node_lock); 260 if (list_empty(&adev->physical_node_list)) { 261 adev = NULL; 262 } else { ··· 266 if (node->dev != dev) 267 adev = NULL; 268 } 269 + mutex_unlock(physical_node_lock); 270 271 return adev; 272 }