This patch removes an impossible code path found by the Coverity
checker (look at the assignement in the first line of the context).
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
drivers/media/dvb/b2c2/skystar2.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.12-rc2-mm2-full/drivers/media/dvb/b2c2/skystar2.c.old
2005-04-09 22:09:27.000000000 +0200
+++ linux-2.6.12-rc2-mm2-full/drivers/media/dvb/b2c2/skystar2.c 2005-04-09
22:10:13.000000000 +0200
@@ -1358,49 +1358,49 @@ static int dma_init_dma(struct adapter *
subbuffers = 2;
subbufsize = (((adapter->dmaq1.buffer_size / 2) / 4) << 8) |
subbuffers;
subbuf0 = adapter->dmaq1.bus_addr & 0xfffffffc;
subbuf1 = ((adapter->dmaq1.bus_addr +
adapter->dmaq1.buffer_size / 2) & 0xfffffffc) | 1;
dprintk("%s: first subbuffer address = 0x%x\n", __FUNCTION__,
subbuf0);
udelay(1000);
write_reg_dw(adapter, 0x000, subbuf0);
dprintk("%s: subbuffer size = 0x%x\n", __FUNCTION__,
(subbufsize >> 8) * 4);
udelay(1000);
write_reg_dw(adapter, 0x004, subbufsize);
dprintk("%s: second subbuffer address = 0x%x\n", __FUNCTION__,
subbuf1);
udelay(1000);
write_reg_dw(adapter, 0x00c, subbuf1);
dprintk("%s: counter = 0x%x\n", __FUNCTION__,
adapter->dmaq1.bus_addr & 0xfffffffc);
write_reg_dw(adapter, 0x008, adapter->dmaq1.bus_addr &
0xfffffffc);
udelay(1000);
- dma_enable_disable_irq(adapter, 0, 1, subbuffers ? 1 : 0);
+ dma_enable_disable_irq(adapter, 0, 1, 1);
irq_dma_enable_disable_irq(adapter, 1);
sram_set_media_dest(adapter, 1);
sram_set_net_dest(adapter, 1);
sram_set_cai_dest(adapter, 2);
sram_set_cao_dest(adapter, 2);
}
if (dma_channel == 1) {
dprintk("%s: Initializing DMA2 channel\n", __FUNCTION__);
subbuffers = 2;
subbufsize = (((adapter->dmaq2.buffer_size / 2) / 4) << 8) |
subbuffers;
subbuf0 = adapter->dmaq2.bus_addr & 0xfffffffc;
subbuf1 = ((adapter->dmaq2.bus_addr +
adapter->dmaq2.buffer_size / 2) & 0xfffffffc) | 1;
dprintk("%s: first subbuffer address = 0x%x\n", __FUNCTION__,
subbuf0);
udelay(1000);
write_reg_dw(adapter, 0x010, subbuf0);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
