shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next

Browse Source
This commit is contained in:
Zheng Yang
2014-07-12 15:04:42 +08:00
parent 1c0c2c38a3 74b63344fd
commit 3cfc06be12
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/rtc/rtc-HYM8563.c
View File

@@ -569,6 +569,7 @@ static int hym8563_probe(struct i2c_client *client, const struct i2c_device_id
gClient = client;
hym8563->client = client;
hym8563->alarm.enabled = 0;
client->irq = 0;
mutex_init(&hym8563->mutex);
wake_lock_init(&hym8563->wake_lock, WAKE_LOCK_SUSPEND, "rtc_hym8563");
i2c_set_clientdata(client, hym8563);
@@ -591,15 +592,17 @@ static int hym8563_probe(struct i2c_client *client, const struct i2c_device_id
}
client->irq = of_get_named_gpio_flags(np, "irq_gpio", 0,(enum of_gpio_flags *)&irq_flags);
hym8563->irq = gpio_to_irq(client->irq);
result = devm_request_threaded_irq(&client->dev, hym8563->irq, NULL, hym8563_wakeup_irq, irq_flags | IRQF_ONESHOT, client->dev.driver->name,hym8563 );
if (result) {
printk(KERN_ERR "%s:fail to request irq = %d, ret = 0x%x\n",__func__, hym8563->irq, result);
goto exit;
}
enable_irq_wake(hym8563->irq);
device_init_wakeup(&client->dev, 1);
if(client->irq >= 0)
{
hym8563->irq = gpio_to_irq(client->irq);
result = devm_request_threaded_irq(&client->dev, hym8563->irq, NULL, hym8563_wakeup_irq, irq_flags | IRQF_ONESHOT, client->dev.driver->name,hym8563 );
if (result) {
printk(KERN_ERR "%s:fail to request irq = %d, ret = 0x%x\n",__func__, hym8563->irq, result);
goto exit;
}
enable_irq_wake(hym8563->irq);
device_init_wakeup(&client->dev, 1);
}
rtc = devm_rtc_device_register(&client->dev,
client->name,
&hym8563_rtc_ops, THIS_MODULE);