[Armadeus-commitlog] SF.net SVN: armadeus: [573] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.18.1/055-linux-2.6.18-rtc-ds1374.diff

[<jo...@us...>]

Revision: 573
          http://armadeus.svn.sourceforge.net/armadeus/?rev=573&view=rev
Author:   jorasse
Date:     2007-02-26 14:07:26 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
[linux RTC-ds1374] fix crash when RTC probe fails (for example short circuit with i2c lines)

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/055-linux-2.6.18-rtc-ds1374.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/055-linux-2.6.18-rtc-ds1374.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/055-linux-2.6.18-rtc-ds1374.diff	2007-02-25 11:17:37 UTC (rev 572)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/055-linux-2.6.18-rtc-ds1374.diff	2007-02-26 22:07:26 UTC (rev 573)
@@ -1,6 +1,6 @@
 diff -purN -x '*~' ref/linux-2.6.18.1/drivers/rtc/Kconfig linux-2.6.18.1/drivers/rtc/Kconfig
 --- ref/linux-2.6.18.1/drivers/rtc/Kconfig	2006-10-14 05:34:03.000000000 +0200
-+++ linux-2.6.18.1/drivers/rtc/Kconfig	2007-01-13 17:39:29.000000000 +0100
++++ linux-2.6.18.1/drivers/rtc/Kconfig	2007-02-25 20:22:02.000000000 +0100
 @@ -111,6 +111,16 @@ config RTC_DRV_DS1307
  	  This driver can also be built as a module. If so, the module
  	  will be called rtc-ds1307.
@@ -20,7 +20,7 @@
  	depends on RTC_CLASS
 diff -purN -x '*~' ref/linux-2.6.18.1/drivers/rtc/Makefile linux-2.6.18.1/drivers/rtc/Makefile
 --- ref/linux-2.6.18.1/drivers/rtc/Makefile	2006-10-14 05:34:03.000000000 +0200
-+++ linux-2.6.18.1/drivers/rtc/Makefile	2007-01-13 17:40:38.000000000 +0100
++++ linux-2.6.18.1/drivers/rtc/Makefile	2007-02-25 20:22:02.000000000 +0100
 @@ -15,6 +15,7 @@ obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205
  obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o
  obj-$(CONFIG_RTC_DRV_TEST)	+= rtc-test.o
@@ -31,8 +31,8 @@
  obj-$(CONFIG_RTC_DRV_PCF8563)	+= rtc-pcf8563.o
 diff -purN -x '*~' ref/linux-2.6.18.1/drivers/rtc/rtc-ds1374.c linux-2.6.18.1/drivers/rtc/rtc-ds1374.c
 --- ref/linux-2.6.18.1/drivers/rtc/rtc-ds1374.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.18.1/drivers/rtc/rtc-ds1374.c	2007-01-13 18:06:06.000000000 +0100
-@@ -0,0 +1,279 @@
++++ linux-2.6.18.1/drivers/rtc/rtc-ds1374.c	2007-02-26 22:46:55.000000000 +0100
+@@ -0,0 +1,282 @@
 +/*
 + * An rtc/alarm/i2c driver for the Dallas ds1374
 + * based on rts-ds1672 driver from Alessandro Zummo
@@ -286,8 +286,11 @@
 +	return 0;
 +
 +exit_detach:
-+	i2c_detach_client(client);
++	if (!IS_ERR(rtc))
++		rtc_device_unregister(rtc);
 +
++	if ((err = i2c_detach_client(client)))
++
 +exit_kfree:
 +	kfree(client);
 +
@@ -312,4 +315,3 @@
 +
 +module_init(ds1374_init);
 +module_exit(ds1374_exit);
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.