From patchwork Thu Jan 13 04:43:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent McIntyre X-Patchwork-Id: 5569 Return-path: Envelope-to: mchehab@pedra Delivery-date: Thu, 13 Jan 2011 10:11:43 -0200 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1PdM1m-0006u8-QO for mchehab@pedra; Thu, 13 Jan 2011 10:11:43 -0200 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 13 Jan 2011 10:11:42 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PdF1z-0005b4-V7; Thu, 13 Jan 2011 04:43:28 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752178Ab1AMEnZ (ORCPT + 1 other); Wed, 12 Jan 2011 23:43:25 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:55779 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752027Ab1AMEnZ (ORCPT ); Wed, 12 Jan 2011 23:43:25 -0500 Received: by yxt3 with SMTP id 3so524464yxt.19 for ; Wed, 12 Jan 2011 20:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=lJokpiq84vbnx67Z0fBdgdFmA/9Pt/r8M6q+5X8VkRs=; b=JXqZiR2QTenRaaXBVIvAaQQ0RUpb3ptZVFQQF7pL32x8JqeqtuMhk1DdbQQ+fR/0m8 GD77UR9qC/Vpd8FK9Z8xlQYF+1eV5kBqqd51vJe4iRvp0KCrn591aYiwhkhUOgFgJSLe CSgEK0sibh414HI1XPqvgHILtfpDPHigeeSvY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=Pcozv04z0dEkBjoQE/7LjOqOZ5bG5Dm3YzXDeWXmjhpPZiNdxE6Z6iH39wTQiVC+yv PpzWOl00rl5hTKIx3MxFK/0TqwLpvX/RqJaTFoUs7iJc+IaBOo5V+mVxGX1bqNLcID5K ep/D7Xgn12KHSM4TcWjMIFXjODXd/tcBblDio= MIME-Version: 1.0 Received: by 10.151.153.10 with SMTP id f10mr3187836ybo.21.1294893804315; Wed, 12 Jan 2011 20:43:24 -0800 (PST) Received: by 10.151.7.18 with HTTP; Wed, 12 Jan 2011 20:43:24 -0800 (PST) Date: Thu, 13 Jan 2011 15:43:24 +1100 Message-ID: Subject: [patch] addition to v2.6.35_i2c_new_probed_device.patch (was: Re: Debug code in HG repositories) From: Vincent McIntyre To: Mauro Carvalho Chehab Cc: Hans Verkuil , Devin Heitmueller , linux-media@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: On 1/12/11, Mauro Carvalho Chehab wrote: >> which on the face of it suggests >> btty-input.c already handled, my mistake. >> cx88-input.c the search string was in a comment >> hdpvr-i2c.c see below > I have no time currently to touch on it, since I still have lots of patches > to > take a look and submit for the merge window. So, if you have some time, > could you please prepare and submit a patch fixing it? This seems to be a relatively simple patch, inline below. This is against the linux-media tree, I could not figure out how to turn it into a clean patch of media_build/backports/v2.6.35_i2c_new_probed_device.patch I did look for guidance on how to do this in media_build/README.patches but could not find anything that looked relevant. The code now compiles for me but I don't know if it will actually work, I don't have the hardware. Cheers Vince Signed-off-by: Vince McIntyre --- drivers/media/video/hdpvr/hdpvr-i2c.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) From 1b44e5c3b2886224042d9c20649311c231db3ccd Mon Sep 17 00:00:00 2001 From: Vince McIntyre Date: Thu, 13 Jan 2011 15:30:13 +1100 Subject: [PATCH] To compile against 2.6.32, drop extra arg when calling i2c_new_probed_device() Signed-off-by: Vince McIntyre --- drivers/media/video/hdpvr/hdpvr-i2c.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c index 24966aa..129639a 100644 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c @@ -59,7 +59,7 @@ static int hdpvr_new_i2c_ir(struct hdpvr_device *dev, struct i2c_adapter *adap, break; } - return i2c_new_probed_device(adap, &info, addr_list, NULL) == NULL ? + return i2c_new_probed_device(adap, &info, addr_list) == NULL ? -1 : 0; } -- 1.7.0.4