diff options
author | Jarod Wilson <jarod@redhat.com> | 2011-07-18 15:54:23 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-08-27 07:50:31 -0400 |
commit | fa3348980a504c01e300823ab743cb2d874327fa (patch) | |
tree | 459a553a6bf847f9637ebb6bcaee10fcbf7c5cf5 /drivers/media/rc | |
parent | 417c0a23b7d0384682d6032fbc6a62ab25ce7c18 (diff) |
[media] mceusb: set wakeup bits for IR-based resume
Its not uncommon for folks to force these bits enabled, because people
do want to wake their htpc kit via their remote. Lets just set the bits
for 'em.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/mceusb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index 7af57383c89d..d095b4d13d79 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <linux/usb.h> | 38 | #include <linux/usb.h> |
39 | #include <linux/usb/input.h> | 39 | #include <linux/usb/input.h> |
40 | #include <linux/pm_wakeup.h> | ||
40 | #include <media/rc-core.h> | 41 | #include <media/rc-core.h> |
41 | 42 | ||
42 | #define DRIVER_VERSION "1.91" | 43 | #define DRIVER_VERSION "1.91" |
@@ -1287,6 +1288,10 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf, | |||
1287 | 1288 | ||
1288 | usb_set_intfdata(intf, ir); | 1289 | usb_set_intfdata(intf, ir); |
1289 | 1290 | ||
1291 | /* enable wake via this device */ | ||
1292 | device_set_wakeup_capable(ir->dev, true); | ||
1293 | device_set_wakeup_enable(ir->dev, true); | ||
1294 | |||
1290 | dev_info(&intf->dev, "Registered %s on usb%d:%d\n", name, | 1295 | dev_info(&intf->dev, "Registered %s on usb%d:%d\n", name, |
1291 | dev->bus->busnum, dev->devnum); | 1296 | dev->bus->busnum, dev->devnum); |
1292 | 1297 | ||