From patchwork Sat Mar 26 01:51:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 665431 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2Q1plCW032697 for ; Sat, 26 Mar 2011 01:51:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934225Ab1CZBvn (ORCPT ); Fri, 25 Mar 2011 21:51:43 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:61495 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932229Ab1CZBvn (ORCPT ); Fri, 25 Mar 2011 21:51:43 -0400 Received: by pvg12 with SMTP id 12so230493pvg.19 for ; Fri, 25 Mar 2011 18:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=WX8Ey8feHzhYCCLelpEjAqPiL59GU0fXvaiBQvkrdFI=; b=M09pgFR2O5adPQs4EWO1NPyFp8/plF5FAgx2Z6DM6yEMkljm8UUrR3Fh67RTpXU6rC sDbP9yIFw27JuE/UqG3vTS6yQyxdc2Ssh4W5Wdb/31WnN6FcNRHMi3AtMXBY2sHiQ+kZ su/DM7A1l1gwC4a8PS8ZKevLMfEdOHagcKzs4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=s5JXlDpffgKyiZlejBiVNrXaYiHwPUlN3adSLFFt7R0m7eFslOfj2gXLLZQhCrrfXI Uag1fcjbdcCWKFeKSRyv3Fe6afOxD8jSpSPnZqYXp3UZui20AAgtUXgVhzSQtwZK/Ohb I12g0SX0Rg16FijaOHppryEQNhtd723W8x6uk= Received: by 10.142.44.5 with SMTP id r5mr1152258wfr.300.1301104302363; Fri, 25 Mar 2011 18:51:42 -0700 (PDT) Received: from bicker ([212.49.88.34]) by mx.google.com with ESMTPS id n4sm2084604wfl.2.2011.03.25.18.51.36 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2011 18:51:41 -0700 (PDT) Date: Sat, 26 Mar 2011 04:51:12 +0300 From: Dan Carpenter To: Mike Isely Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 2/6] [media] pvrusb2: fix remaining checkpatch.pl complaints Message-ID: <20110326015112.GG2008@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 26 Mar 2011 01:51:47 +0000 (UTC) diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c index a5d4867..370a9ab 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-std.c +++ b/drivers/media/video/pvrusb2/pvrusb2-std.c @@ -20,7 +20,7 @@ #include "pvrusb2-std.h" #include "pvrusb2-debug.h" -#include +#include #include struct std_name { @@ -294,9 +294,8 @@ static struct v4l2_standard *match_std(v4l2_std_id id) unsigned int idx; for (idx = 0; idx < generic_standards_cnt; idx++) { - if (generic_standards[idx].id & id) { + if (generic_standards[idx].id & id) return generic_standards + idx; - } } return NULL; }