summaryrefslogtreecommitdiff
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-07-18 16:54:23 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-08-27 08:50:31 -0300
commitfa3348980a504c01e300823ab743cb2d874327fa (patch)
tree459a553a6bf847f9637ebb6bcaee10fcbf7c5cf5 /drivers/media/rc
parent417c0a23b7d0384682d6032fbc6a62ab25ce7c18 (diff)
downloadlwn-fa3348980a504c01e300823ab743cb2d874327fa.tar.gz
lwn-fa3348980a504c01e300823ab743cb2d874327fa.zip
[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.c5
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 @@
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/usb/input.h>
+#include <linux/pm_wakeup.h>
#include <media/rc-core.h>
#define DRIVER_VERSION "1.91"
@@ -1287,6 +1288,10 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
usb_set_intfdata(intf, ir);
+ /* enable wake via this device */
+ device_set_wakeup_capable(ir->dev, true);
+ device_set_wakeup_enable(ir->dev, true);
+
dev_info(&intf->dev, "Registered %s on usb%d:%d\n", name,
dev->bus->busnum, dev->devnum);