Skip to content

Commit 48b06ff

Browse files
rafaeljwij-intel
authored andcommitted
platform/x86: toshiba_bluetooth: Check ACPI_COMPANION() against NULL
Every platform driver can be forced to match a device that doesn't match its list of device IDs because of device_match_driver_override(), so platform drivers that rely on the existence of a device's ACPI companion object need to verify its presence. Accordingly, add a requisite ACPI_COMPANION() check against NULL to the platform/x86 toshiba_bluetooth driver. Fixes: 553b2ac ("platform/x86: toshiba_bluetooth: Convert ACPI driver to a platform one") Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/2715450.Lt9SDvczpP@rafael.j.wysocki Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 0978824 commit 48b06ff

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/platform/x86/toshiba_bluetooth.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,14 @@ static int toshiba_bt_resume(struct device *dev)
230230

231231
static int toshiba_bt_rfkill_probe(struct platform_device *pdev)
232232
{
233-
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
234233
struct toshiba_bluetooth_dev *bt_dev;
234+
struct acpi_device *device;
235235
int result;
236236

237+
device = ACPI_COMPANION(&pdev->dev);
238+
if (!device)
239+
return -ENODEV;
240+
237241
result = toshiba_bluetooth_present(device->handle);
238242
if (result)
239243
return result;

0 commit comments

Comments
 (0)