Skip to content

Commit 8a17c62

Browse files
rafaeljwij-intel
authored andcommitted
platform/x86: dell/dell-rbtn: 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 dell-rbtn driver. Fixes: 19ebacf ("platform/x86: dell/dell-rbtn: 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/2276487.irdbgypaU6@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 08f29dc commit 8a17c62

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/platform/x86/dell/dell-rbtn.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,15 @@ static void rbtn_cleanup(struct device *dev)
396396

397397
static int rbtn_probe(struct platform_device *pdev)
398398
{
399-
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
400399
struct rbtn_data *rbtn_data;
400+
struct acpi_device *device;
401401
enum rbtn_type type;
402402
int ret = 0;
403403

404+
device = ACPI_COMPANION(&pdev->dev);
405+
if (!device)
406+
return -ENODEV;
407+
404408
type = rbtn_check(device);
405409
if (type == RBTN_UNKNOWN) {
406410
dev_info(&pdev->dev, "Unknown device type\n");

0 commit comments

Comments
 (0)