From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 12 Feb 2010 23:34:05 +0000 (-0800)
Subject: another .31 patch
X-Git-Tag: v2.6.32.9~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4eb15375f837ca93fb1384a730fd0f32115f5f02;p=thirdparty%2Fkernel%2Fstable-queue.git

another .31 patch
---

diff --git a/queue-2.6.31/rtc-fm3130-add-missing-braces.patch b/queue-2.6.31/rtc-fm3130-add-missing-braces.patch
new file mode 100644
index 00000000000..c286bf8c818
--- /dev/null
+++ b/queue-2.6.31/rtc-fm3130-add-missing-braces.patch
@@ -0,0 +1,49 @@
+From f4b5162820de60204afa5c8639335f4931b7fb0c Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Tue, 2 Feb 2010 13:43:59 -0800
+Subject: rtc-fm3130: add missing braces
+
+From: Sergey Matyukevich <geomatsi@gmail.com>
+
+commit f4b5162820de60204afa5c8639335f4931b7fb0c upstream.
+
+Add missing braces for multiline 'if' statements in fm3130_probe.
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
+Cc: Sergey Lapin <slapin@ossfans.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/rtc/rtc-fm3130.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/rtc/rtc-fm3130.c
++++ b/drivers/rtc/rtc-fm3130.c
+@@ -376,20 +376,22 @@ static int __devinit fm3130_probe(struct
+ 	}
+ 
+ 	/* Disabling calibration mode */
+-	if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL)
++	if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) {
+ 		i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL,
+ 			fm3130->regs[FM3130_RTC_CONTROL] &
+ 				~(FM3130_RTC_CONTROL_BIT_CAL));
+ 		dev_warn(&client->dev, "Disabling calibration mode!\n");
++	}
+ 
+ 	/* Disabling read and write modes */
+ 	if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_WRITE ||
+-	    fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ)
++	    fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) {
+ 		i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL,
+ 			fm3130->regs[FM3130_RTC_CONTROL] &
+ 				~(FM3130_RTC_CONTROL_BIT_READ |
+ 					FM3130_RTC_CONTROL_BIT_WRITE));
+ 		dev_warn(&client->dev, "Disabling READ or WRITE mode!\n");
++	}
+ 
+ 	/* oscillator off?  turn it on, so clock can tick. */
+ 	if (fm3130->regs[FM3130_CAL_CONTROL] & FM3130_CAL_CONTROL_BIT_nOSCEN)
diff --git a/queue-2.6.31/series b/queue-2.6.31/series
index 1bbc57f2747..05aabfca6eb 100644
--- a/queue-2.6.31/series
+++ b/queue-2.6.31/series
@@ -10,5 +10,6 @@ resource-add-helpers-for-fetching-rlimits.patch
 fs-exec.c-restrict-initial-stack-space-expansion-to-rlimit.patch
 
 # needs more to be added first
+rtc-fm3130-add-missing-braces.patch
 fix-race-in-tty_fasync-properly.patch