From patchwork Thu Jul 19 20:45:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 1218471 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 2933D3FD48 for ; Thu, 19 Jul 2012 20:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751507Ab2GSUp6 (ORCPT ); Thu, 19 Jul 2012 16:45:58 -0400 Received: from smtp-vbr1.xs4all.nl ([194.109.24.21]:3542 "EHLO smtp-vbr1.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114Ab2GSUp6 (ORCPT ); Thu, 19 Jul 2012 16:45:58 -0400 Received: from alastor.dyndns.org (166.80-203-20.nextgentel.com [80.203.20.166] (may be forged)) (authenticated bits=0) by smtp-vbr1.xs4all.nl (8.13.8/8.13.8) with ESMTP id q6JKjtJh045981 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 19 Jul 2012 22:45:56 +0200 (CEST) (envelope-from hverkuil@xs4all.nl) Received: from tschai.localnet (tschai.lan [192.168.1.195]) (Authenticated sender: hans) by alastor.dyndns.org (Postfix) with ESMTPSA id 4969A35E0007 for ; Thu, 19 Jul 2012 22:45:50 +0200 (CEST) From: Hans Verkuil To: "linux-media" Subject: [PATCH] vivi: remove pointless video_nr++ Date: Thu, 19 Jul 2012 22:45:49 +0200 User-Agent: KMail/1.13.7 (Linux/3.4.0-rc7-tschai; KDE/4.8.4; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201207192245.49852.hverkuil@xs4all.nl> X-Virus-Scanned: by XS4ALL Virus Scanner Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Remove the pointless video_nr++. It doesn't do anything useful and it has the unexpected side-effect of changing the video_nr module option, so cat /sys/module/vivi/parameters/video_nr gives a different value back then what was specified with modprobe. Signed-off-by: Hans Verkuil --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 1e8c4f3..679e329 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -1330,9 +1330,6 @@ static int __init vivi_create_instance(int inst) /* Now that everything is fine, let's add it to device list */ list_add_tail(&dev->vivi_devlist, &vivi_devlist); - if (video_nr != -1) - video_nr++; - v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n", video_device_node_name(vfd)); return 0;