On 1/12/11, Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> 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 <vincent.mcintyre@xxxxxxxxx>
---
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
From 1b44e5c3b2886224042d9c20649311c231db3ccd Mon Sep 17 00:00:00 2001
From: Vince McIntyre <vincent.mcintyre@xxxxxxxxx>
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 <vincent.mcintyre@xxxxxxxxx>
---
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
