From patchwork Fri Jan 31 13:03:34 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: 3561541 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4928AC02DC for ; Fri, 31 Jan 2014 13:03:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3063F20213 for ; Fri, 31 Jan 2014 13:03:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F27DB2020F for ; Fri, 31 Jan 2014 13:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932287AbaAaNDJ (ORCPT ); Fri, 31 Jan 2014 08:03:09 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47839 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932241AbaAaNDI (ORCPT ); Fri, 31 Jan 2014 08:03:08 -0500 Received: from localhost (ip-213-49-233-218.dsl.scarlet.be [213.49.233.218]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 13BE02B; Fri, 31 Jan 2014 13:03:07 +0000 (UTC) From: Greg Kroah-Hartman To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, Greg Kroah-Hartman , "Pierre-Loup A. Griffais" Subject: [PATCH 7/7] Input: xpad: properly name the LED class devices Date: Fri, 31 Jan 2014 14:03:34 +0100 Message-Id: <1391173414-6199-8-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 Don't just increment the LED device number, but use the joystick id so that you have a chance to associate the LED device to the correct xpad device by the name, instead of having to use the sysfs tree, which really doesn't work. Cc: "Pierre-Loup A. Griffais" Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/xpad.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index d342d41a7a0d..ae156de46a12 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -781,8 +781,6 @@ static void xpad_led_set(struct led_classdev *led_cdev, static int xpad_led_probe(struct usb_xpad *xpad) { - static atomic_t led_seq = ATOMIC_INIT(0); - long led_no; struct xpad_led *led; struct led_classdev *led_cdev; int error; @@ -794,9 +792,7 @@ static int xpad_led_probe(struct usb_xpad *xpad) if (!led) return -ENOMEM; - led_no = (long)atomic_inc_return(&led_seq) - 1; - - snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); + snprintf(led->name, sizeof(led->name), "xpad%d", xpad->joydev_id); led->xpad = xpad; led_cdev = &led->led_cdev; @@ -944,16 +940,17 @@ static int xpad_init_input(struct usb_xpad *xpad) } error = xpad_init_ff(xpad); - if (error) - goto fail_init_ff; - - error = xpad_led_probe(xpad); - if (error) - goto fail_init_led; + if (error) { + input_free_device(input_dev); + return error; + } error = input_register_device(xpad->dev); - if (error) - goto fail_input_register; + if (error) { + input_ff_destroy(input_dev); + input_free_device(input_dev); + return error; + } joydev_dev = device_find_child(&xpad->dev->dev, NULL, xpad_find_joydev); @@ -966,17 +963,14 @@ static int xpad_init_input(struct usb_xpad *xpad) xpad_send_led_command(xpad, (xpad->joydev_id % 4) + 2); } - return 0; - -fail_input_register: - xpad_led_disconnect(xpad); - -fail_init_led: - input_ff_destroy(input_dev); + error = xpad_led_probe(xpad); + if (error) { + input_ff_destroy(input_dev); + input_unregister_device(input_dev); + return error; + } -fail_init_ff: - input_free_device(input_dev); - return error; + return 0; } static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id)