From patchwork Fri Jan 31 13:03:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 3561531 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 34E119F391 for ; Fri, 31 Jan 2014 13:03:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0777320200 for ; Fri, 31 Jan 2014 13:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C186B2008F for ; Fri, 31 Jan 2014 13:03:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932281AbaAaNDG (ORCPT ); Fri, 31 Jan 2014 08:03:06 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47835 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932241AbaAaNDG (ORCPT ); Fri, 31 Jan 2014 08:03:06 -0500 Received: from localhost (ip-213-49-233-218.dsl.scarlet.be [213.49.233.218]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 42F082B; Fri, 31 Jan 2014 13:03:05 +0000 (UTC) From: Greg Kroah-Hartman To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, "Pierre-Loup A. Griffais" , Greg Kroah-Hartman Subject: [PATCH 6/7] Input: xpad: handle "present" and "gone" correctly Date: Fri, 31 Jan 2014 14:03:33 +0100 Message-Id: <1391173414-6199-7-git-send-email-gregkh@linuxfoundation.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391173414-6199-1-git-send-email-gregkh@linuxfoundation.org> References: <1391173414-6199-1-git-send-email-gregkh@linuxfoundation.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Pierre-Loup A. Griffais" Handle the "a new device is present" message properly by dynamically creating the input device at this point in time. This requires a workqueue as we are in interrupt context when we learn about this. Also properly disconnect any devices that we are told are removed. Signed-off-by: "Pierre-Loup A. Griffais" Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/xpad.c | 50 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 7a07b95790d7..d342d41a7a0d 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -293,8 +293,11 @@ struct usb_xpad { int xtype; /* type of xbox device */ int joydev_id; /* the minor of the device */ const char *name; /* name of the device */ + struct work_struct work; /* to init/remove device from callback */ }; +static int xpad_init_input(struct usb_xpad *xpad); + /* * xpad_process_packet * @@ -437,6 +440,22 @@ static void xpad360_process_packet(struct usb_xpad *xpad, input_sync(dev); } +static void presence_work_function(struct work_struct *work) +{ + struct usb_xpad *xpad = container_of(work, struct usb_xpad, work); + int error; + + if (xpad->pad_present) { + error = xpad_init_input(xpad); + if (error) { + /* complain only, not much else we can do here */ + dev_err(&xpad->dev->dev, "unable to init device\n"); + } + } else { + input_unregister_device(xpad->dev); + } +} + /* * xpad360w_process_packet * @@ -451,16 +470,22 @@ static void xpad360_process_packet(struct usb_xpad *xpad, * 01.1 - Pad state (Bytes 4+) valid * */ - static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data) { /* Presence change */ if (data[0] & 0x08) { if (data[1] & 0x80) { - xpad->pad_present = 1; - usb_submit_urb(xpad->bulk_out, GFP_ATOMIC); - } else - xpad->pad_present = 0; + if (!xpad->pad_present) { + xpad->pad_present = 1; + usb_submit_urb(xpad->bulk_out, GFP_ATOMIC); + schedule_work(&xpad->work); + } + } else { + if (xpad->pad_present) { + xpad->pad_present = 0; + schedule_work(&xpad->work); + } + } } /* Valid pad data */ @@ -507,10 +532,13 @@ static void xpad_irq_in(struct urb *urb) } exit: - retval = usb_submit_urb(urb, GFP_ATOMIC); - if (retval) - dev_err(dev, "%s - usb_submit_urb failed with result %d\n", - __func__, retval); + if (xpad->pad_present) { + retval = usb_submit_urb(urb, GFP_ATOMIC); + if (retval) + dev_err(dev, + "%s - usb_submit_urb failed with result %d\n", + __func__, retval); + } } static void xpad_bulk_out(struct urb *urb) @@ -991,6 +1019,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id xpad->mapping = xpad_device[i].mapping; xpad->xtype = xpad_device[i].xtype; xpad->name = xpad_device[i].name; + INIT_WORK(&xpad->work, presence_work_function); if (xpad->xtype == XTYPE_UNKNOWN) { if (intf->cur_altsetting->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC) { @@ -1136,7 +1165,8 @@ static void xpad_disconnect(struct usb_interface *intf) struct usb_xpad *xpad = usb_get_intfdata (intf); xpad_led_disconnect(xpad); - input_unregister_device(xpad->dev); + if (xpad->pad_present) + input_unregister_device(xpad->dev); xpad_deinit_output(xpad); if (xpad->xtype == XTYPE_XBOX360W) {