From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752202AbcGULBD (ORCPT ); Thu, 21 Jul 2016 07:01:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50293 "EHLO mout02.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbcGULBA (ORCPT ); Thu, 21 Jul 2016 07:01:00 -0400 Subject: Re: [PATCH 2/4] input: tablet: pegasus_notetaker: Fix usb_autopm calls to be balanced To: Dmitry Torokhov References: <1468852149-2614-1-git-send-email-martink@posteo.de> <1468852149-2614-3-git-send-email-martink@posteo.de> <20160720212943.GA26006@dtor-ws> Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org From: Martin Kepplinger Message-ID: <1a7eb7f1-169f-ee92-66a4-0acbc78106d2@posteo.de> Date: Thu, 21 Jul 2016 13:00:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.1.0 MIME-Version: 1.0 In-Reply-To: <20160720212943.GA26006@dtor-ws> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 2016-07-20 um 23:29 schrieb Dmitry Torokhov: > On Mon, Jul 18, 2016 at 04:29:07PM +0200, Martin Kepplinger wrote: >> Signed-off-by: Martin Kepplinger >> --- >> drivers/input/tablet/pegasus_notetaker.c | 19 +++++++++++-------- >> 1 file changed, 11 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c >> index 27cb352..fdbc5e8 100644 >> --- a/drivers/input/tablet/pegasus_notetaker.c >> +++ b/drivers/input/tablet/pegasus_notetaker.c >> @@ -208,27 +208,30 @@ static int pegasus_open(struct input_dev *dev) >> return retval; >> >> pegasus->irq->dev = pegasus->usbdev; >> - if (usb_submit_urb(pegasus->irq, GFP_KERNEL)) >> + if (usb_submit_urb(pegasus->irq, GFP_KERNEL)) { >> retval = -EIO; >> + goto out; >> + } >> >> retval = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE); > > If this fails I we should kill URB and cancel work. I adjusted and > applied. You're right. Thanks for this! > >> >> - usb_autopm_put_interface(pegasus->intf); >> +out: >> >> - return retval; >> + if (retval < 0) { >> + usb_autopm_put_interface(pegasus->intf); >> + return retval; >> + } else { >> + return 0; >> + } >> } >> >> static void pegasus_close(struct input_dev *dev) >> { >> struct pegasus *pegasus = input_get_drvdata(dev); >> - int autopm_error; >> >> - autopm_error = usb_autopm_get_interface(pegasus->intf); >> usb_kill_urb(pegasus->irq); >> cancel_work_sync(&pegasus->init); >> - >> - if (!autopm_error) >> - usb_autopm_put_interface(pegasus->intf); >> + usb_autopm_put_interface(pegasus->intf); >> } >> >> static int pegasus_probe(struct usb_interface *intf, >> -- >> 2.1.4 >> >