Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b86f581f authored by Russell King's avatar Russell King Committed by Alexandre Belloni
Browse files

rtc: pl031: avoid exposing alarm if no interrupt 



If the RTC has no interrupt, there is little point in exposing the RTC
alarm capabilities, as it can't be used as a wakeup source nor can it
deliver an event to userspace.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 273c868e

drivers/rtc/rtc-pl031.c

+12 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 
	int ret;

	struct pl031_local *ldata;

	struct pl031_vendor_data *vendor = id->data;

	struct rtc_class_ops *ops = &vendor->ops;

	struct rtc_class_ops *ops;

	unsigned long time, data;



	ret = amba_request_regions(adev, NULL);
@@ -329,12 +329,14 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 


	ldata = devm_kzalloc(&adev->dev, sizeof(struct pl031_local),

			     GFP_KERNEL);

	if (!ldata) {

	ops = devm_kmemdup(&adev->dev, &vendor->ops, sizeof(vendor->ops),

			   GFP_KERNEL);

	if (!ldata || !ops) {

		ret = -ENOMEM;

		goto out;

	}

	ldata->vendor = vendor;



	ldata->vendor = vendor;

	ldata->base = devm_ioremap(&adev->dev, adev->res.start,

				   resource_size(&adev->res));

	if (!ldata->base) {
@@ -372,6 +374,13 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 
		}

	}



	if (!adev->irq[0]) {

		/* When there's no interrupt, no point in exposing the alarm */

		ops->read_alarm = NULL;

		ops->set_alarm = NULL;

		ops->alarm_irq_enable = NULL;

	}



	device_init_wakeup(&adev->dev, true);

	ldata->rtc = rtc_device_register("pl031", &adev->dev, ops,

					THIS_MODULE);