diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 22:54:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 22:54:35 -0300 |
| commit | 6601c921cc0606a98bb649b3ebd524450c26cf6e (patch) | |
| tree | 407711515fbdb1eb90ac7dd322f858afdf7587a5 /linux/drivers/media/video/cx88/cx88-core.c | |
| parent | 70563a913cd706ee2ff44f15f9be404764f932dc (diff) | |
| parent | 90fe2a4ea4edbd255bdf8074fbb402d454682e94 (diff) | |
| download | mediapointer-dvb-s2-6601c921cc0606a98bb649b3ebd524450c26cf6e.tar.gz mediapointer-dvb-s2-6601c921cc0606a98bb649b3ebd524450c26cf6e.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx88
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index ca36a48fa..ceaedf352 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1020,7 +1020,7 @@ int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm) set_tvaudio(core); // tell i2c chips - cx88_call_i2c_clients(core,VIDIOC_S_STD,&norm); + call_all(core, tuner, s_std, norm); // done return 0; @@ -1088,8 +1088,11 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci) mutex_lock(&devlist); cx88_ir_fini(core); - if (0 == core->i2c_rc) + if (0 == core->i2c_rc) { + if (core->i2c_rtc) + i2c_unregister_device(core->i2c_rtc); i2c_del_adapter(&core->i2c_adap); + } list_del(&core->devlist); iounmap(core->lmmio); cx88_devcount--; |