diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-16 20:37:51 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-16 20:37:51 -0500 |
| commit | d30a31decd05aa55764418cce0b9cce695885439 (patch) | |
| tree | 8fffef97b8b6d19639ed547eb7d6253b0f336e48 /linux/drivers/media/common/saa7146_core.c | |
| parent | e0449a4964c2aec77cf02c33d2a9375b647530ce (diff) | |
| parent | 32027c8007a8b9e82f70f5eb52387db827ff8b2d (diff) | |
| download | mediapointer-dvb-s2-d30a31decd05aa55764418cce0b9cce695885439.tar.gz mediapointer-dvb-s2-d30a31decd05aa55764418cce0b9cce695885439.tar.bz2 | |
merged ~mkrufky/pending
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/common/saa7146_core.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 71a5f1329..4233c2c2b 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -116,8 +116,7 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) pg = vmalloc_to_page(virt); if (NULL == pg) goto err; - if (PageHighMem(pg)) - BUG(); + BUG_ON(PageHighMem(pg)); sglist[i].page = pg; sglist[i].length = PAGE_SIZE; } |