diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-07 02:29:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-07 02:29:12 -0800 |
| commit | b9575611ae5c8f422367ee0f46f1547ccf650c2c (patch) | |
| tree | 7745226fd24d6dfb98a05da31f697f10d80252cc | |
| parent | 957ac61653451a792f0cf2ec97642b8423e60035 (diff) | |
| parent | 03eec28be7a2088aa45e55105b142e9f4c7813d1 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 4 | ||||
| -rw-r--r-- | mm/mremap.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index ea26eac35df7..eed2b5b12958 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c @@ -2673,9 +2673,9 @@ static int tuner_set_tv_freq (struct saa7146_dev *dev, u32 freq) buf[1] = div & 0xff; buf[2] = 0x8e; - if (freq < (u32) 16*168.25 ) + if (freq < (u32) (16*168.25) ) config = 0xa0; - else if (freq < (u32) 16*447.25) + else if (freq < (u32) (16*447.25) ) config = 0x90; else config = 0x30; diff --git a/mm/mremap.c b/mm/mremap.c index ce523ef85555..e308e6a58639 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -316,7 +316,7 @@ unsigned long do_mremap(unsigned long addr, new_len = PAGE_ALIGN(new_len); /* Don't allow the degenerate cases */ - if (!(old_len | new_len)) + if (!old_len || !new_len) goto out; /* new_addr is only valid if MREMAP_FIXED is specified */ |