From patchwork Thu Nov 8 18:11:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Frank_Sch=C3=A4fer?= X-Patchwork-Id: 1717101 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 76EB33FCDE for ; Thu, 8 Nov 2012 19:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756624Ab2KHTMj (ORCPT ); Thu, 8 Nov 2012 14:12:39 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:65470 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756617Ab2KHTMi (ORCPT ); Thu, 8 Nov 2012 14:12:38 -0500 Received: by mail-ee0-f46.google.com with SMTP id b15so1754511eek.19 for ; Thu, 08 Nov 2012 11:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=oLvbIZaiwoEYLyp9iaK+jDTE592m+41bZwWWJ5U9ay0=; b=HTaeuWmKpUwA3e8ekZE8ZkD8ZZwE0+bJlY9zh53sHLziemvgtWF6RoKXcr/eQy3hIJ u3vzYkeOfpAMS9uSyWlStv8QZ+iGdG2Wvz8Jc2ILjRnpNRxJDdFMIrJt51fkANNKusAS e4cbrTD/PxJi49gvK/71/GSepM9A2ml72KyAQx902xM7SIH65gAYmXhvFunBGJpZc2Bv bbfW+Qvg1otUyKTvH1Z1iJGpmETJPbQ3AaHEuizE7Cc+z2K13Ph+n+04HS5uwpTuisJp rW07qwVkL9qKHdoEHfMcTBe36jhSjjhPVH+kBpkQkksU2Jab3PoR2a+TQxtmhfLznAtn YrJg== Received: by 10.14.199.134 with SMTP id x6mr30390749een.31.1352401958250; Thu, 08 Nov 2012 11:12:38 -0800 (PST) Received: from Athlon64X2-5000.site (ip-5-146-108-198.unitymediagroup.de. [5.146.108.198]) by mx.google.com with ESMTPS id g5sm71927323eem.4.2012.11.08.11.12.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Nov 2012 11:12:37 -0800 (PST) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH v2 12/21] em28xx: remove double checks for urb->status == -ENOENT in urb_data_copy functions Date: Thu, 8 Nov 2012 20:11:44 +0200 Message-Id: <1352398313-3698-13-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352398313-3698-1-git-send-email-fschaefer.oss@googlemail.com> References: <1352398313-3698-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This check is already done in the URB handler em28xx_irq_callback before calling these functions. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-dvb.c | 5 +---- drivers/media/usb/em28xx/em28xx-video.c | 10 ++-------- 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index eeabc25..1ad4f10 100644 --- a/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c @@ -134,11 +134,8 @@ static inline int em28xx_dvb_isoc_copy(struct em28xx *dev, struct urb *urb) if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) return 0; - if (urb->status < 0) { + if (urb->status < 0) print_err_status(dev, -1, urb->status); - if (urb->status == -ENOENT) - return 0; - } for (i = 0; i < urb->number_of_packets; i++) { int status = urb->iso_frame_desc[i].status; diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 4024dfc..3518753 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -429,11 +429,8 @@ static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb) if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) return 0; - if (urb->status < 0) { + if (urb->status < 0) print_err_status(dev, -1, urb->status); - if (urb->status == -ENOENT) - return 0; - } buf = dev->usb_ctl.vid_buf; if (buf != NULL) @@ -525,11 +522,8 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb) if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED)) return 0; - if (urb->status < 0) { + if (urb->status < 0) print_err_status(dev, -1, urb->status); - if (urb->status == -ENOENT) - return 0; - } buf = dev->usb_ctl.vid_buf; if (buf != NULL)