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

Commit 778575ff authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-bfin.c: do not abort when requesting irq fails 



The RTC framework does not let you return an error once a call to
devm_rtc_device_register has succeeded.  Avoid doing that when the IRQ
request fails as we can still support reading/writing the clock without
the IRQ.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Reported-by: default avatarAles Novak <alnovak@suse.cz>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd914bba

drivers/rtc/rtc-bfin.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -346,7 +346,7 @@ static int bfin_rtc_probe(struct platform_device *pdev) 
{

{

	struct bfin_rtc *rtc;

	struct bfin_rtc *rtc;

	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;

	int ret = 0;

	int ret;

	unsigned long timeout = jiffies + HZ;

	unsigned long timeout = jiffies + HZ;





	dev_dbg_stamp(dev);

	dev_dbg_stamp(dev);
@@ -361,16 +361,17 @@ static int bfin_rtc_probe(struct platform_device *pdev) 
	/* Register our RTC with the RTC framework */

	/* Register our RTC with the RTC framework */

	rtc->rtc_dev = devm_rtc_device_register(dev, pdev->name, &bfin_rtc_ops,

	rtc->rtc_dev = devm_rtc_device_register(dev, pdev->name, &bfin_rtc_ops,

						THIS_MODULE);

						THIS_MODULE);

	if (unlikely(IS_ERR(rtc->rtc_dev))) {

	if (unlikely(IS_ERR(rtc->rtc_dev)))

		ret = PTR_ERR(rtc->rtc_dev);

		return PTR_ERR(rtc->rtc_dev);

		goto err;

	}





	/* Grab the IRQ and init the hardware */

	/* Grab the IRQ and init the hardware */

	ret = devm_request_irq(dev, IRQ_RTC, bfin_rtc_interrupt, 0,

	ret = devm_request_irq(dev, IRQ_RTC, bfin_rtc_interrupt, 0,

				pdev->name, dev);

				pdev->name, dev);

	if (unlikely(ret))

	if (unlikely(ret))

		goto err;

		dev_err(&pdev->dev,

			"unable to request IRQ; alarm won't work, "

			"and writes will be delayed\n");



	/* sometimes the bootloader touched things, but the write complete was not

	/* sometimes the bootloader touched things, but the write complete was not

	 * enabled, so let's just do a quick timeout here since the IRQ will not fire ...

	 * enabled, so let's just do a quick timeout here since the IRQ will not fire ...

	 */

	 */
@@ -381,9 +382,6 @@ static int bfin_rtc_probe(struct platform_device *pdev) 
	bfin_write_RTC_SWCNT(0);

	bfin_write_RTC_SWCNT(0);





	return 0;

	return 0;



err:

	return ret;

}

}





static int bfin_rtc_remove(struct platform_device *pdev)

static int bfin_rtc_remove(struct platform_device *pdev)