rpms/kernel/devel hdpvr-ir-enable.patch,1.7,1.8

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20734

Modified Files:
	hdpvr-ir-enable.patch 
Log Message:
fix hdpvr-ir-enable

hdpvr-ir-enable.patch:
 Makefile     |    4 --
 hdpvr-core.c |   12 ++------
 hdpvr-i2c.c  |   83 +++++++++++++++++++++++++++++++++++++++++------------------
 hdpvr.h      |    2 -
 4 files changed, 64 insertions(+), 37 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- hdpvr-ir-enable.patch	13 Jun 2010 17:12:13 -0000	1.7
+++ hdpvr-ir-enable.patch	14 Jun 2010 09:44:06 -0000	1.8
@@ -1,11 +1,21 @@
-From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
-
----
+ drivers/media/video/hdpvr/Makefile     |    4 +-
  drivers/media/video/hdpvr/hdpvr-core.c |   12 ++---
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   79 ++++++++++++++++++++++----------
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   83 ++++++++++++++++++++++----------
  drivers/media/video/hdpvr/hdpvr.h      |    2 +-
- 3 files changed, 59 insertions(+), 34 deletions(-)
+ 4 files changed, 64 insertions(+), 37 deletions(-)
 
+diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
+index e0230fc..a0b9a43 100644
+--- a/drivers/media/video/hdpvr/Makefile
++++ b/drivers/media/video/hdpvr/Makefile
+@@ -1,6 +1,4 @@
+-hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
+-
+-hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
++hdpvr-objs	:= hdpvr-control.o hdpvr-i2c.o hdpvr-core.o hdpvr-video.o
+ 
+ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
 index 2fc9865..c72793a 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
@@ -38,10 +48,19 @@ index 2fc9865..c72793a 100644
  #endif /* CONFIG_I2C */
  
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index 463b81b..ae26237 100644
+index 463b81b..a0557e4 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -22,8 +22,11 @@
+@@ -10,6 +10,8 @@
+  *
+  */
+ 
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
++
+ #include <linux/i2c.h>
+ #include <linux/slab.h>
+ 
+@@ -22,8 +24,11 @@
  #define REQTYPE_I2C_WRITE	0xb0
  #define REQTYPE_I2C_WRITE_STATT	0xd0
  
@@ -55,7 +74,7 @@ index 463b81b..ae26237 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -33,7 +36,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -33,7 +38,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -64,7 +83,7 @@ index 463b81b..ae26237 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,8 +49,8 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,8 +51,8 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	return ret;
  }
  
@@ -75,7 +94,7 @@ index 463b81b..ae26237 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -58,7 +61,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -58,7 +63,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -84,7 +103,7 @@ index 463b81b..ae26237 100644
  
  	if (ret < 0)
  		goto error;
-@@ -68,7 +71,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -68,7 +73,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
  			      0, 0, buf, 2, 1000);
  
@@ -93,7 +112,7 @@ index 463b81b..ae26237 100644
  		ret = 0;
  	else if (ret >= 0)
  		ret = -EIO;
-@@ -93,10 +96,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+@@ -93,10 +98,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  		addr = msgs[i].addr << 1;
  
  		if (msgs[i].flags & I2C_M_RD)
@@ -106,7 +125,7 @@ index 463b81b..ae26237 100644
  						 msgs[i].len);
  	}
  
-@@ -115,30 +118,56 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -115,31 +120,59 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
@@ -179,6 +198,9 @@ index 463b81b..ae26237 100644
  
  error:
  	return retval;
+ }
++
++#endif /* CONFIG_I2C */
 diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
 index 49ae25d..8a5729a 100644
 --- a/drivers/media/video/hdpvr/hdpvr.h