summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/Documentation/dvb/get_dvb_firmware4
-rw-r--r--linux/drivers/media/common/saa7146_core.c6
-rw-r--r--linux/drivers/media/common/saa7146_fops.c12
-rw-r--r--linux/drivers/media/common/saa7146_video.c11
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dibusb-common.c5
-rw-r--r--v4l/ChangeLog22
6 files changed, 33 insertions, 27 deletions
diff --git a/linux/Documentation/dvb/get_dvb_firmware b/linux/Documentation/dvb/get_dvb_firmware
index a0f409dca..08e96ff55 100644
--- a/linux/Documentation/dvb/get_dvb_firmware
+++ b/linux/Documentation/dvb/get_dvb_firmware
@@ -223,8 +223,8 @@ sub vp7041 {
}
sub dibusb {
- my $url = "http://www.linuxtv.org/downloads/firmware/dvb-usb-dibusb-5.0.0.11.fw";
- my $outfile = "dvb-usb-dibusb-5.0.0.11.fw";
+ my $url = "http://www.linuxtv.org/downloads/firmware/dvb-dibusb-5.0.0.11.fw";
+ my $outfile = "dvb-dibusb-5.0.0.11.fw";
my $hash = "fa490295a527360ca16dcdf3224ca243";
checkstandard();
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c
index c6b7f3763..c6889d003 100644
--- a/linux/drivers/media/common/saa7146_core.c
+++ b/linux/drivers/media/common/saa7146_core.c
@@ -168,10 +168,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
return;
pci_free_consistent(pci, pt->size, pt->cpu, pt->dma);
pt->cpu = NULL;
- if (NULL != pt->slist) {
- kfree(pt->slist);
- pt->slist = NULL;
- }
+ kfree(pt->slist);
+ pt->slist = NULL;
}
int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c
index 57c661c8e..e1a9f8471 100644
--- a/linux/drivers/media/common/saa7146_fops.c
+++ b/linux/drivers/media/common/saa7146_fops.c
@@ -73,9 +73,7 @@ int saa7146_buffer_queue(struct saa7146_dev *dev,
struct saa7146_dmaqueue *q,
struct saa7146_buf *buf)
{
-#ifdef DEBUG_SPINLOCKS
- BUG_ON(!spin_is_locked(&dev->slock));
-#endif
+ assert_spin_locked(&dev->slock);
DEB_EE(("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf));
BUG_ON(!q);
@@ -96,9 +94,7 @@ void saa7146_buffer_finish(struct saa7146_dev *dev,
struct saa7146_dmaqueue *q,
int state)
{
-#ifdef DEBUG_SPINLOCKS
- BUG_ON(!spin_is_locked(&dev->slock));
-#endif
+ assert_spin_locked(&dev->slock);
DEB_EE(("dev:%p, dmaq:%p, state:%d\n", dev, q, state));
DEB_EE(("q->curr:%p\n",q->curr));
@@ -126,9 +122,7 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi));
-#ifdef DEBUG_SPINLOCKS
- BUG_ON(!spin_is_locked(&dev->slock));
-#endif
+ assert_spin_locked(&dev->slock);
if (!list_empty(&q->queue)) {
/* activate next one from queue */
buf = list_entry(q->queue.next,struct saa7146_buf,vb.queue);
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index 46d571423..68d777bdf 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -1007,10 +1007,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
return get_control(fh,arg);
}
case VIDIOC_S_CTRL:
-/* FIXME: remove when videodev2.h update is in kernel */
-#ifdef VIDIOC_S_CTRL_OLD
- case VIDIOC_S_CTRL_OLD:
-#endif
{
DEB_EE(("VIDIOC_S_CTRL\n"));
err = set_control(fh,arg);
@@ -1119,10 +1115,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
return 0;
}
case VIDIOC_OVERLAY:
-/* FIXME: remove when videodev2.h update is in kernel */
-#ifdef VIDIOC_OVERLAY_OLD
- case VIDIOC_OVERLAY_OLD:
-#endif
{
int on = *(int *)arg;
int err = 0;
@@ -1248,7 +1240,8 @@ static int buffer_activate (struct saa7146_dev *dev,
return 0;
}
-static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,enum v4l2_field field)
+static int buffer_prepare(struct videobuf_queue *q,
+ struct videobuf_buffer *vb, enum v4l2_field field)
{
struct file *file = q->priv_data;
struct saa7146_fh *fh = file->private_data;
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");
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 002250c1c..c464e7940 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,25 @@
+2005-12-08 15:45 mchehab
+
+ * linux/Documentation/dvb/get_dvb_firmware:
+ - Updated firmware names
+
+ * linux/drivers/media/common/saa7146_core.c:
+ (saa7146_pgtable_free):
+ - kfree (NULL) is valid.
+
+ * linux/drivers/media/common/saa7146_fops.c:
+ (saa7146_buffer_queue), (saa7146_buffer_finish),
+ (saa7146_buffer_next):
+ - assert_spin_locked() is the new way
+
+ * linux/drivers/media/common/saa7146_video.c:
+ (saa7146_video_do_ioctl), (buffer_prepare):
+ * linux/drivers/media/dvb/dvb-usb/dibusb-common.c:
+ (dibusb_i2c_xfer):
+ - small fixes to make in sync with kernel
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-08 15:10 mchehab
* linux/drivers/media/dvb/dvb-core/dvb_filter.c:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 11:09:49 +0000