← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to drivers/rtc/rtc-isl1208.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/rtc/rtc-isl1208.c
494
494
{
495
495
        unsigned long timeout = jiffies + msecs_to_jiffies(1000);
496
496
        struct i2c_client *client = data;
 
497
        struct rtc_device *rtc = i2c_get_clientdata(client);
497
498
        int handled = 0, sr, err;
498
499
 
499
500
        /*
516
517
        if (sr & ISL1208_REG_SR_ALM) {
517
518
                dev_dbg(&client->dev, "alarm!\n");
518
519
 
 
520
                rtc_update_irq(rtc, 1, RTC_IRQF | RTC_AF);
 
521
 
519
522
                /* Clear the alarm */
520
523
                sr &= ~ISL1208_REG_SR_ALM;
521
524
                sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR, sr);