mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge 4.6-rc4 into driver-core-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
5614e77258
1061 changed files with 10883 additions and 7098 deletions
|
|
@ -246,6 +246,8 @@ static int device_wakeup_attach(struct device *dev, struct wakeup_source *ws)
|
|||
return -EEXIST;
|
||||
}
|
||||
dev->power.wakeup = ws;
|
||||
if (dev->power.wakeirq)
|
||||
device_wakeup_attach_irq(dev, dev->power.wakeirq);
|
||||
spin_unlock_irq(&dev->power.lock);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue