Skip to content

Commit 0978824

Browse files
rafaeljwij-intel
authored andcommitted
platform/x86: toshiba_acpi: 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_acpi driver. Fixes: 246d6ce ("platform/x86: toshiba_acpi: 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/1973170.CQOukoFCf9@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 840bcd6 commit 0978824

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/platform/x86/toshiba_acpi.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3374,7 +3374,7 @@ static const struct dmi_system_id toshiba_dmi_quirks[] __initconst = {
33743374

33753375
static int toshiba_acpi_probe(struct platform_device *pdev)
33763376
{
3377-
struct acpi_device *acpi_dev = ACPI_COMPANION(&pdev->dev);
3377+
struct acpi_device *acpi_dev;
33783378
struct toshiba_acpi_dev *dev;
33793379
const char *hci_method;
33803380
u32 dummy;
@@ -3383,6 +3383,10 @@ static int toshiba_acpi_probe(struct platform_device *pdev)
33833383
if (toshiba_acpi)
33843384
return -EBUSY;
33853385

3386+
acpi_dev = ACPI_COMPANION(&pdev->dev);
3387+
if (!acpi_dev)
3388+
return -ENODEV;
3389+
33863390
pr_info("Toshiba Laptop ACPI Extras version %s\n",
33873391
TOSHIBA_ACPI_VERSION);
33883392

0 commit comments

Comments
 (0)