Commit b74d2caa authored by Alessandro Zummo's avatar Alessandro Zummo Committed by Linus Torvalds
Browse files

rtc: fix driver data issues in several rtc drivers 



Herton Ronaldo Krzesinski recently raised up, and fixed, an issue with the
rtc_cmos driver, which was referring to an inconsistent driver data.

This patch ensures that driver data registration happens before
rtc_device_register().

Signed-off-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Acked-by: default avatarThomas Hommel <thomas.hommel@gefanuc.com>
Acked-by: default avatarHans-Christian Egtvedt <hcegtvedt@atmel.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Andrew Sharp <andy.sharp@onstor.com>
Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Alexander Bigga <ab@mycable.de>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Mark Zhan <rongkai.zhan@windriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d1b2efa8

drivers/rtc/rtc-at32ap700x.c

+3 −1
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
		goto out_iounmap;

	}



	platform_set_drvdata(pdev, rtc);



	rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,

				&at32_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc->rtc)) {
@@ -264,7 +266,6 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
		goto out_free_irq;

	}



	platform_set_drvdata(pdev, rtc);

	device_init_wakeup(&pdev->dev, 1);



	dev_info(&pdev->dev, "Atmel RTC for AT32AP700x at %08lx irq %ld\n",
@@ -273,6 +274,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
	return 0;



out_free_irq:

	platform_set_drvdata(pdev, NULL);

	free_irq(irq, rtc);

out_iounmap:

	iounmap(rtc->regs);

drivers/rtc/rtc-bq4802.c

+2 −1
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ static int __devinit bq4802_probe(struct platform_device *pdev) 
		goto out_free;

	}



	platform_set_drvdata(pdev, p);



	p->rtc = rtc_device_register("bq4802", &pdev->dev,

				     &bq4802_ops, THIS_MODULE);

	if (IS_ERR(p->rtc)) {
@@ -176,7 +178,6 @@ static int __devinit bq4802_probe(struct platform_device *pdev) 
		goto out_iounmap;

	}



	platform_set_drvdata(pdev, p);

	err = 0;

out:

	return err;

drivers/rtc/rtc-ds1302.c

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static int ds1302_rtc_ioctl(struct device *dev, unsigned int cmd, 
#ifdef RTC_SET_CHARGE

	case RTC_SET_CHARGE:

	{

		struct ds1302_rtc *rtc = dev_get_drvdata(dev);

		int tcs_val;



		if (copy_from_user(&tcs_val, (int __user *)arg, sizeof(int)))

drivers/rtc/rtc-ds1305.c

+6 −8
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ static struct bin_attribute nvram = { 
static int __devinit ds1305_probe(struct spi_device *spi)

{

	struct ds1305			*ds1305;

	struct rtc_device		*rtc;

	int				status;

	u8				addr, value;

	struct ds1305_platform_data	*pdata = spi->dev.platform_data;
@@ -756,14 +755,13 @@ static int __devinit ds1305_probe(struct spi_device *spi) 
		dev_dbg(&spi->dev, "AM/PM\n");



	/* register RTC ... from here on, ds1305->ctrl needs locking */

	rtc = rtc_device_register("ds1305", &spi->dev,

	ds1305->rtc = rtc_device_register("ds1305", &spi->dev,

			&ds1305_ops, THIS_MODULE);

	if (IS_ERR(rtc)) {

		status = PTR_ERR(rtc);

	if (IS_ERR(ds1305->rtc)) {

		status = PTR_ERR(ds1305->rtc);

		dev_dbg(&spi->dev, "register rtc --> %d\n", status);

		goto fail0;

	}

	ds1305->rtc = rtc;



	/* Maybe set up alarm IRQ; be ready to handle it triggering right

	 * away.  NOTE that we don't share this.  The signal is active low,
@@ -774,7 +772,7 @@ static int __devinit ds1305_probe(struct spi_device *spi) 
	if (spi->irq) {

		INIT_WORK(&ds1305->work, ds1305_work);

		status = request_irq(spi->irq, ds1305_irq,

				0, dev_name(&rtc->dev), ds1305);

				0, dev_name(&ds1305->rtc->dev), ds1305);

		if (status < 0) {

			dev_dbg(&spi->dev, "request_irq %d --> %d\n",

					spi->irq, status);
@@ -794,7 +792,7 @@ static int __devinit ds1305_probe(struct spi_device *spi) 
fail2:

	free_irq(spi->irq, ds1305);

fail1:

	rtc_device_unregister(rtc);

	rtc_device_unregister(ds1305->rtc);

fail0:

	kfree(ds1305);

	return status;

drivers/rtc/rtc-m48t35.c

+8 −8
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static const struct rtc_class_ops m48t35_ops = { 


static int __devinit m48t35_probe(struct platform_device *pdev)

{

	struct rtc_device *rtc;

	struct resource *res;

	struct m48t35_priv *priv;

	int ret = 0;
@@ -171,20 +170,21 @@ static int __devinit m48t35_probe(struct platform_device *pdev) 
		ret = -ENOMEM;

		goto out;

	}



	spin_lock_init(&priv->lock);

	rtc = rtc_device_register("m48t35", &pdev->dev,



	platform_set_drvdata(pdev, priv);



	priv->rtc = rtc_device_register("m48t35", &pdev->dev,

				  &m48t35_ops, THIS_MODULE);

	if (IS_ERR(rtc)) {

		ret = PTR_ERR(rtc);

	if (IS_ERR(priv->rtc)) {

		ret = PTR_ERR(priv->rtc);

		goto out;

	}

	priv->rtc = rtc;

	platform_set_drvdata(pdev, priv);



	return 0;



out:

	if (priv->rtc)

		rtc_device_unregister(priv->rtc);

	if (priv->reg)

		iounmap(priv->reg);

	if (priv->baseaddr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE