lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sa1100' into devel

Browse Source
This commit is contained in:
Russell King
2009-12-06 17:00:33 +00:00
parent 0719dc3413 1bf8e62195
commit 3d14b5beba
733 changed files with 34262 additions and 18361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/rtc/rtc-pcf50633.c
View File

@ -292,8 +292,9 @@ static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
&pcf50633_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc_dev)) {
int ret = PTR_ERR(rtc->rtc_dev);
kfree(rtc);
return PTR_ERR(rtc->rtc_dev);
return ret;
}
pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,

6
drivers/rtc/rtc-x1205.c
View File

@ -195,7 +195,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
/* year, since the rtc epoch*/
buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100);
buf[CCR_WDAY] = tm->tm_wday & 0x07;
buf[CCR_Y2K] = bin2bcd(tm->tm_year / 100);
buf[CCR_Y2K] = bin2bcd((tm->tm_year + 1900) / 100);
}
/* If writing alarm registers, set compare bits on registers 0-4 */
@ -280,9 +280,9 @@ static int x1205_fix_osc(struct i2c_client *client)
int err;
struct rtc_time tm;
tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
memset(&tm, 0, sizeof(tm));
err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE, 0);
err = x1205_set_datetime(client, &tm, 1, X1205_CCR_BASE, 0);
if (err < 0)
dev_err(&client->dev, "unable to restart the oscillator\n");