[PATCH v4 05/15] Platform: OLPC: Avoid a warning if the EC didn't register yet
From: Lubomir Rintel
Date: Tue Jan 08 2019 - 12:58:58 EST
Just return EPROBE_DEFER, so that whoever attempted to use the EC call can
defer their work.
Signed-off-by: Lubomir Rintel <lkundrak@xxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
---
Changes since v2:
- Adjust the commit message for the s/ENODEV/EPROBE_DEFER/ change
Changes since v1:
- EPROBE_DEFER instead of ENODEV
drivers/platform/olpc/olpc-ec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index 981955dce926..d7d51a851937 100644
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -118,8 +118,11 @@ int olpc_ec_cmd(u8 cmd, u8 *inbuf, size_t inlen, u8 *outbuf, size_t outlen)
struct olpc_ec_priv *ec = ec_priv;
struct ec_cmd_desc desc;
- /* Ensure a driver and ec hook have been registered */
- if (WARN_ON(!ec_driver || !ec_driver->ec_cmd))
+ /* Driver not yet registered. */
+ if (!ec_driver)
+ return -EPROBE_DEFER;
+
+ if (WARN_ON(!ec_driver->ec_cmd))
return -ENODEV;
if (!ec)
--
2.20.1