aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/vp702x.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-02-10 16:53:29 +0000
committerSteve French <sfrench@us.ibm.com>2006-02-10 16:53:29 +0000
commitb580513e841d81eebf0d7b02f412be0882c2ce5f (patch)
tree9336a14058eed66c335db10512f33a31f9e8c938 /drivers/media/dvb/dvb-usb/vp702x.c
parent04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff)
parent418aade459f03318defd18ef0b11981a63bd81b0 (diff)
downloadkernel_samsung_tuna-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip
kernel_samsung_tuna-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz
kernel_samsung_tuna-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.bz2
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp702x.c')
-rw-r--r--drivers/media/dvb/dvb-usb/vp702x.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c
index afa00fd..4a95eca 100644
--- a/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/drivers/media/dvb/dvb-usb/vp702x.c
@@ -53,7 +53,8 @@ int vp702x_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8
return ret;
}
-int vp702x_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen)
+static int vp702x_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
+ u16 index, u8 *b, int blen)
{
deb_xfer("out: req. %x, val: %x, ind: %x, buffer: ",req,value,index);
debug_dump(b,blen,deb_xfer);
@@ -88,7 +89,8 @@ unlock:
return ret;
}
-int vp702x_usb_inout_cmd(struct dvb_usb_device *d, u8 cmd, u8 *o, int olen, u8 *i, int ilen, int msec)
+static int vp702x_usb_inout_cmd(struct dvb_usb_device *d, u8 cmd, u8 *o,
+ int olen, u8 *i, int ilen, int msec)
{
u8 bout[olen+2];
u8 bin[ilen+1];