From patchwork Tue Dec 6 13:39:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 8729 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RXvFM-0004JL-IS; Tue, 06 Dec 2011 14:39:49 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1RXvFL-000295-G2; Tue, 06 Dec 2011 14:39:48 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933381Ab1LFNjm (ORCPT + 4 others); Tue, 6 Dec 2011 08:39:42 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:53373 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933131Ab1LFNjj (ORCPT ); Tue, 6 Dec 2011 08:39:39 -0500 Received: from benhur.adnet.avionic-design.de (p548E075F.dip0.t-ipconnect.de [84.142.7.95]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MV0jR-1RHmND1uNJ-00Z1h2; Tue, 06 Dec 2011 14:39:38 +0100 Received: from mailbox.adnet.avionic-design.de (add-virt-zarafa.adnet.avionic-design.de [172.20.129.9]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id 09D022C4118; Tue, 6 Dec 2011 14:39:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id DDFA32A28196; Tue, 6 Dec 2011 14:39:37 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IRj4w6LspWHA; Tue, 6 Dec 2011 14:39:36 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id AD2672A28159; Tue, 6 Dec 2011 14:39:36 +0100 (CET) From: Thierry Reding To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, Stefan Ringel Subject: [PATCH 1/2] [media] tm6000: Fix check for interrupt endpoint Date: Tue, 6 Dec 2011 14:39:35 +0100 Message-Id: <1323178776-12305-1-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1322509580-14460-1-git-send-email-linuxtv@stefanringel.de> References: <1322509580-14460-1-git-send-email-linuxtv@stefanringel.de> X-Provags-ID: V02:K0:1kXgHNSC3UbC9MqlnlK1qfirG7A3CsP/7JOJdycZ0/5 ZftBKCYZwJs0eNWzhZw6NnLR4tEDjr44Fgz6D9fY6oNjtiYiyQ SjQjnwag+Udzi9Qt0j59YRGVRgmkCHjxLWs/UeALDTsZ5IuE7O sSsg3iK7JY6jALAFdZeAPp+ul+JjRxTBY6n2R7c1vslMlM9ZLo EH3t50kLONsmxCIRmXgaFOipEQ4LjIFKfnewc+9S2osv1yaIKj NRNVU/nqSE1UnAlh0VLjscmha+wtFISb9GkbT/7qvLMWaJRuDG A5exhW0BeRP9qcM2ifv2gEbaPdUQCV8zjNMEu3id8SZ5Ek9qn6 9zvuyouHf0ph/pk4px9lNlQ3v7dt63/r9V+UadmdkL1GEp8BLo Jyxk8HA2NifluTZxiPnTTd59p4AQrkYAMNQtGfxoVwTsRmwIHP L64yO Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.6.133314 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -6.9 (------) X-LSpam-Report: No, score=-6.9 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5 autolearn=ham Checking for &dev->int_in is useless because it returns the address of the embedded struct tm6000_endpoint, which will always be positive and therefore true. Signed-off-by: Thierry Reding --- drivers/media/video/tm6000/tm6000-input.c | 2 +- drivers/media/video/tm6000/tm6000-video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/tm6000/tm6000-input.c b/drivers/media/video/tm6000/tm6000-input.c index af4bcf5..89e003c 100644 --- a/drivers/media/video/tm6000/tm6000-input.c +++ b/drivers/media/video/tm6000/tm6000-input.c @@ -426,7 +426,7 @@ int tm6000_ir_init(struct tm6000_core *dev) rc->scanmask = 0xffff; rc->priv = ir; rc->change_protocol = tm6000_ir_change_protocol; - if (&dev->int_in) { + if (dev->int_in.endp) { rc->open = __tm6000_ir_int_start; rc->close = __tm6000_ir_int_stop; INIT_DELAYED_WORK(&ir->work, tm6000_ir_int_work); diff --git a/drivers/media/video/tm6000/tm6000-video.c b/drivers/media/video/tm6000/tm6000-video.c index e147d92..87eb909 100644 --- a/drivers/media/video/tm6000/tm6000-video.c +++ b/drivers/media/video/tm6000/tm6000-video.c @@ -1647,7 +1647,7 @@ static int tm6000_release(struct file *file) usb_reset_configuration(dev->udev); - if (&dev->int_in) + if (dev->int_in.endp) usb_set_interface(dev->udev, dev->isoc_in.bInterfaceNumber, 2);