Merge branch 'next' into for-linus

[sfrench/cifs-2.6.git] / drivers / input / joystick / xpad.c

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 8c73377ac82ca4abb9510f559d8c1f3ce3afec1b..0687f0ed60b838a96a00f6d015c192467fd0696a 100644 (file)
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1339,7 +1339,7 @@ struct xpad_led {
        struct usb_xpad *xpad;
 };
 
-/**
+/*
  * set the LEDs on Xbox360 / Wireless Controllers
  * @param command
  *  0: off
@@ -1904,7 +1904,7 @@ static int xpad_suspend(struct usb_interface *intf, pm_message_t message)
                        xpad360w_poweroff_controller(xpad);
        } else {
                mutex_lock(&input->mutex);
-               if (input->users)
+               if (input_device_enabled(input))
                        xpad_stop_input(xpad);
                mutex_unlock(&input->mutex);
        }
@@ -1924,7 +1924,7 @@ static int xpad_resume(struct usb_interface *intf)
                retval = xpad360w_start_input(xpad);
        } else {
                mutex_lock(&input->mutex);
-               if (input->users) {
+               if (input_device_enabled(input)) {
                        retval = xpad_start_input(xpad);
                } else if (xpad->xtype == XTYPE_XBOXONE) {
                        /*