git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
pluto2
/
pluto2.c
diff --git
a/drivers/media/dvb/pluto2/pluto2.c
b/drivers/media/dvb/pluto2/pluto2.c
index
2310b2b
..
1c5316e
100644
(file)
--- a/
drivers/media/dvb/pluto2/pluto2.c
+++ b/
drivers/media/dvb/pluto2/pluto2.c
@@
-424,8
+424,8
@@
static inline u32 divide(u32 numerator, u32 denominator)
}
/* LG Innotek TDTE-E001P (Infineon TUA6034) */
}
/* LG Innotek TDTE-E001P (Infineon TUA6034) */
-static int lg_tdtpe001p_
tuner_set_params
(struct dvb_frontend *fe,
-
struct dvb_frontend_parameters *p)
+static int lg_tdtpe001p_
pll_set
(struct dvb_frontend *fe,
+ struct dvb_frontend_parameters *p)
{
struct pluto *pluto = frontend_to_pluto(fe);
struct i2c_msg msg;
{
struct pluto *pluto = frontend_to_pluto(fe);
struct i2c_msg msg;
@@
-473,8
+473,6
@@
static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe,
msg.buf = buf;
msg.len = sizeof(buf);
msg.buf = buf;
msg.len = sizeof(buf);
- if (fe->ops.i2c_gate_ctrl)
- fe->ops.i2c_gate_ctrl(fe, 1);
ret = i2c_transfer(&pluto->i2c_adap, &msg, 1);
if (ret < 0)
return ret;
ret = i2c_transfer(&pluto->i2c_adap, &msg, 1);
if (ret < 0)
return ret;
@@
-499,6
+497,8
@@
static struct tda1004x_config pluto2_fe_config __devinitdata = {
.xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_DEFAULT,
.if_freq = TDA10046_FREQ_3617,
.xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_DEFAULT,
.if_freq = TDA10046_FREQ_3617,
+ .pll_set = lg_tdtpe001p_pll_set,
+ .pll_sleep = NULL,
.request_firmware = pluto2_request_firmware,
};
.request_firmware = pluto2_request_firmware,
};
@@
-511,12
+511,11
@@
static int __devinit frontend_init(struct pluto *pluto)
dev_err(&pluto->pdev->dev, "could not attach frontend\n");
return -ENODEV;
}
dev_err(&pluto->pdev->dev, "could not attach frontend\n");
return -ENODEV;
}
- pluto->fe->ops.tuner_ops.set_params = lg_tdtpe001p_tuner_set_params;
ret = dvb_register_frontend(&pluto->dvb_adapter, pluto->fe);
if (ret < 0) {
ret = dvb_register_frontend(&pluto->dvb_adapter, pluto->fe);
if (ret < 0) {
- if (pluto->fe->ops
.
release)
- pluto->fe->ops
.
release(pluto->fe);
+ if (pluto->fe->ops
->
release)
+ pluto->fe->ops
->
release(pluto->fe);
return ret;
}
return ret;
}
@@
-616,7
+615,7
@@
static int __devinit pluto2_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, pluto);
pci_set_drvdata(pdev, pluto);
- ret = request_irq(pdev->irq, pluto_irq,
IRQF_SHARED
, DRIVER_NAME, pluto);
+ ret = request_irq(pdev->irq, pluto_irq,
SA_SHIRQ
, DRIVER_NAME, pluto);
if (ret < 0)
goto err_pci_iounmap;
if (ret < 0)
goto err_pci_iounmap;
@@
-648,7
+647,7
@@
static int __devinit pluto2_probe(struct pci_dev *pdev,
goto err_pluto_hw_exit;
/* dvb */
goto err_pluto_hw_exit;
/* dvb */
- ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE
, &pdev->dev
);
+ ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE);
if (ret < 0)
goto err_i2c_bit_del_bus;
if (ret < 0)
goto err_i2c_bit_del_bus;