[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 7464ff8bf2d762251b9537863db0e1caf9b0e402
WARNING: Author mismatch between patch and found commit:
Backport author: Laura Nao<laura.nao@xxxxxxxxxxxxx>
Commit author: Akihiko Odaki<akihiko.odaki@xxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (exact SHA1)
6.1.y | Present (exact SHA1)
5.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: 7464ff8bf2d76 ! 1: 134ad6ddcdeb5 platform/chrome: cros_ec_typec: Check for EC driver
@@ Metadata
## Commit message ##
platform/chrome: cros_ec_typec: Check for EC driver
+ [ upstream commit 7464ff8bf2d762251b9537863db0e1caf9b0e402 ]
+
The EC driver may not be initialized when cros_typec_probe is called,
particulary when CONFIG_CROS_EC_CHARDEV=m.
@@ Commit message
Reviewed-by: Guenter Roeck <groeck@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220404041101.6276-1-akihiko.odaki@xxxxxxxxx
Signed-off-by: Prashant Malani <pmalani@xxxxxxxxxxxx>
+ Signed-off-by: Laura Nao <laura.nao@xxxxxxxxxxxxx>
## drivers/platform/chrome/cros_ec_typec.c ##
@@ drivers/platform/chrome/cros_ec_typec.c: static int cros_typec_probe(struct platform_device *pdev)
@@ drivers/platform/chrome/cros_ec_typec.c: static int cros_typec_probe(struct plat
+ if (!ec_dev)
+ return -EPROBE_DEFER;
+
- typec->typec_cmd_supported = cros_ec_check_features(ec_dev, EC_FEATURE_TYPEC_CMD);
- typec->needs_mux_ack = cros_ec_check_features(ec_dev, EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK);
-
+ typec->typec_cmd_supported = !!cros_ec_check_features(ec_dev, EC_FEATURE_TYPEC_CMD);
+ typec->needs_mux_ack = !!cros_ec_check_features(ec_dev,
+ EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
