drivers/rtc/rtc-hid-sensor-time.c: improve error handling when rtc register fails

Stop processing hid input when registering the RTC fails and handle a NULL
returned from devm_rtc_device_register() as a failure too.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/rtc/rtc-hid-sensor-time.c b/drivers/rtc/rtc-hid-sensor-time.c
index b5a2874b15ef..4e2a81854f51 100644
--- a/drivers/rtc/rtc-hid-sensor-time.c
+++ b/drivers/rtc/rtc-hid-sensor-time.c
@@ -279,9 +279,11 @@ static int hid_time_probe(struct platform_device *pdev)
                                         "hid-sensor-time", &hid_time_rtc_ops,
                                         THIS_MODULE);
 
-        if (IS_ERR(time_state->rtc)) {
+        if (IS_ERR_OR_NULL(time_state->rtc)) {
+                ret = time_state->rtc ? PTR_ERR(time_state->rtc) : -ENODEV;
+                time_state->rtc = NULL;
+                sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_TIME);
                 dev_err(&pdev->dev, "rtc device register failed!\n");
-                return PTR_ERR(time_state->rtc);
         }
 
         return ret;