From patchwork Fri Mar 26 07:23:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Schilling Landgraf X-Patchwork-Id: 88428 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 o2Q5Q2lR003238 for ; Fri, 26 Mar 2010 05:26:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752344Ab0CZF0m (ORCPT ); Fri, 26 Mar 2010 01:26:42 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:61806 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752272Ab0CZF0l (ORCPT ); Fri, 26 Mar 2010 01:26:41 -0400 Received: by gyg13 with SMTP id 13so37824gyg.19 for ; Thu, 25 Mar 2010 22:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=PmeqTxUNcoLvGLtg+848DnJrJidVkoHx3G8UbAgUM7Q=; b=e9OHD9Ft3vpI1iIr6IGr00+CqeZwzHLGUt8hToIAc9EANt+3vbGy13vT6zWmA3oKYo U8DQOX8ZQvKkG3/WUPn+RgASUVonqPKUh0v6zuKVYd3a98mq/BwWSTd7izLjnzRtPYVL kFKmzQ9pRlMfQ2UWEt2pMtHgu2+vpam4KaymI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=lEBDUsgUfdWr/Ps29QcitgkWo9AQU3IXWwzIepeu4u86ZIA2L0du7tP3bpoBJRTrU9 nv6gRXRe1dZNy5BQdYuisq8VmC7TiizVjnjnu9VeX0Y36Zigyzmux316QPJ1kD0+isE/ I1XZRa1EgOnJdI6vIWGxavW7yoCgbUfQDNljA= Received: by 10.101.201.16 with SMTP id d16mr224502anq.226.1269581199639; Thu, 25 Mar 2010 22:26:39 -0700 (PDT) Received: from localhost.localdomain ([187.36.39.171]) by mx.google.com with ESMTPS id 6sm106961ywc.56.2010.03.25.22.26.37 (version=SSLv3 cipher=RC4-MD5); Thu, 25 Mar 2010 22:26:38 -0700 (PDT) Message-ID: <4BAC60DA.9030606@gmail.com> Date: Fri, 26 Mar 2010 03:23:06 -0400 From: Douglas Schilling Landgraf User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100301 Fedora/3.0.3-1.fc11 Thunderbird/3.0.3 MIME-Version: 1.0 To: Linux Media Mailing List CC: Jean-Francois Moine , Mauro Carvalho Chehab Subject: [PATCH] gspca: Add CONFIG_INPUT to gspca_input_connect() 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.3 (demeter.kernel.org [140.211.167.41]); Fri, 26 Mar 2010 05:26:45 +0000 (UTC) diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 1830ea9..df44eca 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -2281,9 +2281,11 @@ int gspca_dev_probe(struct usb_interface *intf, goto out; gspca_set_default_mode(gspca_dev); +#ifdef CONFIG_INPUT ret = gspca_input_connect(gspca_dev); if (ret) goto out; +#endif mutex_init(&gspca_dev->usb_lock); mutex_init(&gspca_dev->read_lock);