From 90019d346efd7c172caf5de5e4452a14cdc8cc3c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 8 Dec 2005 15:50:06 +0000 Subject: syncronizes some changes between v4l and dvb - Updated firmware names - kfree (NULL) is valid. - assert_spin_locked() is the new way - small fixes to make in sync with kernel Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/dvb') diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index ea96c971b..269d899da 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -13,6 +13,7 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS); +MODULE_LICENSE("GPL"); #define deb_info(args...) dprintk(debug,0x01,args) @@ -122,7 +123,7 @@ static int dibusb_i2c_msg(struct dvb_usb_device *d, u8 addr, /* * I2C master xfer function */ -static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num) +static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num) { struct dvb_usb_device *d = i2c_get_adapdata(adap); int i; @@ -276,5 +277,3 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) return 0; } EXPORT_SYMBOL(dibusb_rc_query); - -MODULE_LICENSE("GPL"); -- cgit v1.2.3