summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-av.c4
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-core.c1
-rw-r--r--linux/drivers/media/dvb/ttpci/budget.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index 7a80f544a..520d5372c 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
@@ -199,7 +199,7 @@ static int budget_av_attach (struct saa7146_dev* dev,
DEB_EE(("dev: %p\n",dev));
- if (bi->type != BUDGET_KNC1) {
+ if (bi->type != BUDGET_KNC1 && bi->type != BUDGET_CIN1200) {
return -ENODEV;
}
@@ -359,9 +359,11 @@ static struct saa7146_extension budget_extension;
MAKE_BUDGET_INFO(knc1, "KNC1 DVB-S", BUDGET_KNC1);
+MAKE_BUDGET_INFO(cin1200, "TerraTec Cinergy 1200 DVB-S", BUDGET_CIN1200);
static struct pci_device_id pci_tbl [] = {
MAKE_EXTENSION_PCI(knc1, 0x1131, 0x4f56),
+ MAKE_EXTENSION_PCI(cin1200, 0x153b, 0x1154),
{
.vendor = 0,
}
diff --git a/linux/drivers/media/dvb/ttpci/budget-core.c b/linux/drivers/media/dvb/ttpci/budget-core.c
index b121742f7..c1172e96a 100644
--- a/linux/drivers/media/dvb/ttpci/budget-core.c
+++ b/linux/drivers/media/dvb/ttpci/budget-core.c
@@ -338,6 +338,7 @@ int ttpci_budget_init (struct budget *budget,
budget->i2c_bus = dvb_register_i2c_bus (master_xfer, dev,
budget->dvb_adapter, 0);
+ strcpy(budget->i2c_adap.name, budget->card->name);
if (!budget->i2c_bus) {
dvb_unregister_adapter (budget->dvb_adapter);
return -ENOMEM;
diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h
index 451479956..d1289851d 100644
--- a/linux/drivers/media/dvb/ttpci/budget.h
+++ b/linux/drivers/media/dvb/ttpci/budget.h
@@ -82,6 +82,7 @@ static struct saa7146_pci_extension_data x_var = { \
#define BUDGET_KNC1 2
#define BUDGET_PATCH 3
#define BUDGET_FS_ACTIVY 4
+#define BUDGET_CIN1200 5
#define BUDGET_VIDEO_PORTA 0
#define BUDGET_VIDEO_PORTB 1