]>
Commit | Line | Data |
---|---|---|
c7880ca6 GKH |
1 | From f4b5162820de60204afa5c8639335f4931b7fb0c Mon Sep 17 00:00:00 2001 |
2 | From: Sergey Matyukevich <geomatsi@gmail.com> | |
3 | Date: Tue, 2 Feb 2010 13:43:59 -0800 | |
4 | Subject: rtc-fm3130: add missing braces | |
5 | ||
6 | From: Sergey Matyukevich <geomatsi@gmail.com> | |
7 | ||
8 | commit f4b5162820de60204afa5c8639335f4931b7fb0c upstream. | |
9 | ||
10 | Add missing braces for multiline 'if' statements in fm3130_probe. | |
11 | ||
12 | Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com> | |
13 | Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> | |
14 | Cc: Sergey Lapin <slapin@ossfans.org> | |
15 | Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |
16 | Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
18 | ||
19 | --- a/drivers/rtc/rtc-fm3130.c | |
20 | +++ b/drivers/rtc/rtc-fm3130.c | |
21 | @@ -376,20 +376,22 @@ static int __devinit fm3130_probe(struct i2c_client *client, | |
22 | } | |
23 | ||
24 | /* Disabling calibration mode */ | |
25 | - if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) | |
26 | + if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) { | |
27 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | |
28 | fm3130->regs[FM3130_RTC_CONTROL] & | |
29 | ~(FM3130_RTC_CONTROL_BIT_CAL)); | |
30 | dev_warn(&client->dev, "Disabling calibration mode!\n"); | |
31 | + } | |
32 | ||
33 | /* Disabling read and write modes */ | |
34 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_WRITE || | |
35 | - fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) | |
36 | + fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) { | |
37 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | |
38 | fm3130->regs[FM3130_RTC_CONTROL] & | |
39 | ~(FM3130_RTC_CONTROL_BIT_READ | | |
40 | FM3130_RTC_CONTROL_BIT_WRITE)); | |
41 | dev_warn(&client->dev, "Disabling READ or WRITE mode!\n"); | |
42 | + } | |
43 | ||
44 | /* oscillator off? turn it on, so clock can tick. */ | |
45 | if (fm3130->regs[FM3130_CAL_CONTROL] & FM3130_CAL_CONTROL_BIT_nOSCEN) |