Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f87d09be authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

parents 4a8e4a27 21e2379b

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ tuner=66 - LG NTSC (TALN mini series) 
tuner=67 - Philips TD1316 Hybrid Tuner

tuner=68 - Philips TUV1236D ATSC/NTSC dual in

tuner=69 - Tena TNF 5335 MF

tuner=70 - Samsung TCPN 2121P30A

drivers/media/dvb/bt8xx/bt878.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static struct pci_driver bt878_pci_driver = { 
      .remove	= bt878_remove,

};



static int bt878_pci_driver_registered = 0;

static int bt878_pci_driver_registered;



/*******************************/

/* Module management functions */

drivers/media/dvb/dvb-core/dvbdev.c

+11 −11
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/device.h>

#include <linux/fs.h>

#include <linux/cdev.h>



#include <linux/mutex.h>

#include "dvbdev.h"



static int dvbdev_debug;
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(dvbdev_debug, "Turn on/off device debugging (default:off)."); 
#define dprintk if (dvbdev_debug) printk



static LIST_HEAD(dvb_adapter_list);

static DECLARE_MUTEX(dvbdev_register_lock);

static DEFINE_MUTEX(dvbdev_register_lock);



static const char * const dnames[] = {

	"video", "audio", "sec", "frontend", "demux", "dvr", "ca",
@@ -202,11 +202,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	struct dvb_device *dvbdev;

	int id;



	if (down_interruptible (&dvbdev_register_lock))

	if (mutex_lock_interruptible(&dvbdev_register_lock))

		return -ERESTARTSYS;



	if ((id = dvbdev_get_free_id (adap, type)) < 0) {

		up (&dvbdev_register_lock);

		mutex_unlock(&dvbdev_register_lock);

		*pdvbdev = NULL;

		printk ("%s: could get find free device id...\n", __FUNCTION__);

		return -ENFILE;
@@ -215,11 +215,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	*pdvbdev = dvbdev = kmalloc(sizeof(struct dvb_device), GFP_KERNEL);



	if (!dvbdev) {

		up(&dvbdev_register_lock);

		mutex_unlock(&dvbdev_register_lock);

		return -ENOMEM;

	}



	up (&dvbdev_register_lock);

	mutex_unlock(&dvbdev_register_lock);



	memcpy(dvbdev, template, sizeof(struct dvb_device));

	dvbdev->type = type;
@@ -289,11 +289,11 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu 
{

	int num;



	if (down_interruptible (&dvbdev_register_lock))

	if (mutex_lock_interruptible(&dvbdev_register_lock))

		return -ERESTARTSYS;



	if ((num = dvbdev_get_free_adapter_num ()) < 0) {

		up (&dvbdev_register_lock);

		mutex_unlock(&dvbdev_register_lock);

		return -ENFILE;

	}
@@ -309,7 +309,7 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu 


	list_add_tail (&adap->list_head, &dvb_adapter_list);



	up (&dvbdev_register_lock);

	mutex_unlock(&dvbdev_register_lock);



	return num;

}
@@ -320,10 +320,10 @@ int dvb_unregister_adapter(struct dvb_adapter *adap) 
{

	devfs_remove("dvb/adapter%d", adap->num);



	if (down_interruptible (&dvbdev_register_lock))

	if (mutex_lock_interruptible(&dvbdev_register_lock))

		return -ERESTARTSYS;

	list_del (&adap->list_head);

	up (&dvbdev_register_lock);

	mutex_unlock(&dvbdev_register_lock);

	return 0;

}

EXPORT_SYMBOL(dvb_unregister_adapter);

drivers/media/dvb/dvb-usb/cxusb.c

+2 −0
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ module_init (cxusb_module_init); 
module_exit (cxusb_module_exit);



MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");

MODULE_AUTHOR("Michael Krufky <mkrufky@m1k.net>");

MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");

MODULE_DESCRIPTION("Driver for Conexant USB2.0 hybrid reference design");

MODULE_VERSION("1.0-alpha");

MODULE_LICENSE("GPL");

drivers/media/dvb/frontends/dvb-pll.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct dvb_pll_desc dvb_pll_tbmv30111in = { 
	.name = "Samsung TBMV30111IN",

	.min = 54000000,

	.max = 860000000,

	.count = 4,

	.count = 6,

	.entries = {

		{ 172000000, 44000000, 166666, 0xb4, 0x01 },

		{ 214000000, 44000000, 166666, 0xb4, 0x02 },