diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-01 17:18:03 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-01 17:18:03 -0200 |
| commit | 066a48c964e17e01684f52a4671affacda22cf88 (patch) | |
| tree | 1a4fd66406be5ba017bf8a7b2c43e0f1acf9888f /linux/drivers | |
| parent | ad0ae8dc8ffa884e357e5bf55c4808e24848559e (diff) | |
| parent | 409d9f8dedae8011ee2694296dc8ffe61812a4a2 (diff) | |
| download | mediapointer-dvb-s2-066a48c964e17e01684f52a4671affacda22cf88.tar.gz mediapointer-dvb-s2-066a48c964e17e01684f52a4671affacda22cf88.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v2l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_v4l.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index da82d6823..6b429ff37 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -509,7 +509,7 @@ int saa7146_vv_release(struct saa7146_dev* dev) DEB_EE(("dev:%p\n",dev)); - pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); + pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); kfree(vv); dev->vv_data = NULL; dev->vv_callback = NULL; diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index 3c6f5fcdc..0510a80f2 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -825,8 +825,13 @@ int av7110_init_v4l(struct av7110 *av7110) int av7110_exit_v4l(struct av7110 *av7110) { + struct saa7146_dev* dev = av7110->dev; + saa7146_unregister_device(&av7110->v4l_dev, av7110->dev); saa7146_unregister_device(&av7110->vbi_dev, av7110->dev); + + saa7146_vv_release(dev); + return 0; } |