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

Commit 2641dc92 authored by roel kluin's avatar roel kluin Committed by Paul Mundt
Browse files

rtc-sh: Unsigned rtc->{periodic,carry,alarm}_irq cannot be negative 



possibly since commit b420b1a7

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent cc3c080d

drivers/rtc/rtc-sh.c

+14 −7
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev) 
	struct sh_rtc *rtc;

	struct resource *res;

	unsigned int tmp;

	int ret = -ENOENT;

	int ret;



	rtc = kzalloc(sizeof(struct sh_rtc), GFP_KERNEL);

	if (unlikely(!rtc))
@@ -584,26 +584,33 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev) 
	spin_lock_init(&rtc->lock);



	/* get periodic/carry/alarm irqs */

	rtc->periodic_irq = platform_get_irq(pdev, 0);

	if (unlikely(rtc->periodic_irq < 0)) {

	ret = platform_get_irq(pdev, 0);

	if (unlikely(ret < 0)) {

		ret = -ENOENT;

		dev_err(&pdev->dev, "No IRQ for period\n");

		goto err_badres;

	}

	rtc->periodic_irq = ret;



	rtc->carry_irq = platform_get_irq(pdev, 1);

	if (unlikely(rtc->carry_irq < 0)) {

	ret = platform_get_irq(pdev, 1);

	if (unlikely(ret < 0)) {

		ret = -ENOENT;

		dev_err(&pdev->dev, "No IRQ for carry\n");

		goto err_badres;

	}

	rtc->carry_irq = ret;



	rtc->alarm_irq = platform_get_irq(pdev, 2);

	if (unlikely(rtc->alarm_irq < 0)) {

	ret = platform_get_irq(pdev, 2);

	if (unlikely(ret < 0)) {

		ret = -ENOENT;

		dev_err(&pdev->dev, "No IRQ for alarm\n");

		goto err_badres;

	}

	rtc->alarm_irq = ret;



	res = platform_get_resource(pdev, IORESOURCE_IO, 0);

	if (unlikely(res == NULL)) {

		ret = -ENOENT;

		dev_err(&pdev->dev, "No IO resource\n");

		goto err_badres;

	}