Commit 7707bda3 authored Sep 11, 2013 by Alexander Holler Committed by Linus Torvalds Sep 11, 2013

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>

parent 666a584d

drivers/rtc/rtc-hid-sensor-time.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message