Skip to content

Commit 16960ac

Browse files
Prashant Malanigregkh
authored andcommitted
platform/chrome: cros_ec_typec: Check for EC device
commit ffebd90 upstream. The Type C ACPI device on older Chromebooks is not generated correctly (since their EC firmware doesn't support the new commands required). In such cases, the crafted ACPI device doesn't have an EC parent, and it is therefore not useful (it shouldn't be generated in the first place since the EC firmware doesn't support any of the Type C commands). To handle devices which use these older firmware revisions, check for the parent EC device handle, and fail the probe if it's not found. Fixes: fdc6b21 ("platform/chrome: Add Type C connector class driver") Reported-by: Alyssa Ross <hi@alyssa.is> Reviewed-by: Tzung-Bi Shih <tzungbi@google.com> Signed-off-by: Prashant Malani <pmalani@chromium.org> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Alyssa Ross <hi@alyssa.is> Tested-by: Alyssa Ross <hi@alyssa.is> Link: https://lore.kernel.org/r/20220126190219.3095419-1-pmalani@chromium.org Signed-off-by: Benson Leung <bleung@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e5b6818 commit 16960ac

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/platform/chrome/cros_ec_typec.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,13 @@ static int cros_typec_probe(struct platform_device *pdev)
712712
return -ENOMEM;
713713

714714
typec->dev = dev;
715+
715716
typec->ec = dev_get_drvdata(pdev->dev.parent);
717+
if (!typec->ec) {
718+
dev_err(dev, "couldn't find parent EC device\n");
719+
return -ENODEV;
720+
}
721+
716722
platform_set_drvdata(pdev, typec);
717723

718724
ret = cros_typec_get_cmd_version(typec);

0 commit comments

Comments
 (0)