diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-08 15:50:06 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-08 15:50:06 +0000 |
| commit | 90019d346efd7c172caf5de5e4452a14cdc8cc3c (patch) | |
| tree | d09f52042485bcccad34171aa3b15b24bc299deb /linux/drivers/media/common/saa7146_core.c | |
| parent | 9f7c5513964f4aa7c2d7bcd79d56f3e5002d4a58 (diff) | |
| download | mediapointer-dvb-s2-90019d346efd7c172caf5de5e4452a14cdc8cc3c.tar.gz mediapointer-dvb-s2-90019d346efd7c172caf5de5e4452a14cdc8cc3c.tar.bz2 | |
syncronizes some changes between v4l and dvb
- Updated firmware names
- kfree (NULL) is valid.
- assert_spin_locked() is the new way
- small fixes to make in sync with kernel
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/common/saa7146_core.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index c6b7f3763..c6889d003 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -168,10 +168,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt) return; pci_free_consistent(pci, pt->size, pt->cpu, pt->dma); pt->cpu = NULL; - if (NULL != pt->slist) { - kfree(pt->slist); - pt->slist = NULL; - } + kfree(pt->slist); + pt->slist = NULL; } int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt) |