From patchwork Wed Jun 9 16:36:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 105176 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o59Ga1HW025149 for ; Wed, 9 Jun 2010 16:36:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755363Ab0FIQgA (ORCPT ); Wed, 9 Jun 2010 12:36:00 -0400 Received: from smtp-out003.kontent.com ([81.88.40.217]:36446 "EHLO smtp-out003.kontent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752484Ab0FIQf7 convert rfc822-to-8bit (ORCPT ); Wed, 9 Jun 2010 12:35:59 -0400 Received: from vanamonde.localnet (p54BE1FED.dip.t-dialin.net [84.190.31.237]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: neukum_org@smtp-out003.kontent.com) by smtp-out003.kontent.com (Postfix) with ESMTPSA id 735F04000340; Wed, 9 Jun 2010 18:35:58 +0200 (CEST) From: Oliver Neukum To: Ondrej Zary Subject: Re: [0000/0003]full power management for usb touchscreens Date: Wed, 9 Jun 2010 18:36:14 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.35-rc2-0.1-default+; KDE/4.3.5; x86_64; ; ) Cc: Dmitry Torokhov , linux-input@vger.kernel.org, linux-usb@vger.kernel.org, Daniel Ritz References: <201006071513.29478.oneukum@suse.de> <20100607161920.GA7706@core.coreip.homeip.net> <201006091540.06003.linux@rainbow-software.org> In-Reply-To: <201006091540.06003.linux@rainbow-software.org> MIME-Version: 1.0 Message-Id: <201006091836.14136.oliver@neukum.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 09 Jun 2010 16:36:01 +0000 (UTC) diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index 421f168..d13517a 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c @@ -1333,7 +1333,7 @@ static int usbtouch_resume(struct usb_interface *intf) int result = 0; mutex_lock(&input->mutex); - if (input->users) + if (input->users || usbtouch->type->irq_always) result = usb_submit_urb(usbtouch->irq, GFP_NOIO); mutex_unlock(&input->mutex); return result; @@ -1484,7 +1484,7 @@ static int usbtouch_probe(struct usb_interface *intf, usbtouch->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; /* device specific allocations */ - if (type->init) { + if (type->alloc) { err = type->alloc(usbtouch); if (err) { dbg("%s - type->alloc() failed, err: %d", __func__, err);