aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@linuxtv.org>2005-11-09 00:35:14 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:01 -0500
commit6573dd752d50730d44c550ad0467d15871963655 (patch)
tree43ba37d29e503b6edbb4de019a643fd03acacc21 /drivers
parent634623d3ba6146e13d06d3f36188c189c8a58a23 (diff)
[PATCH] dvb: pluto2: Removed unavoidable error message and related code
Removed unavoidable error message and related code. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/pluto2/pluto2.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 85b437bbddcd..bbebd1c4caca 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -286,15 +286,10 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets)
286 * although one packet has been transfered. 286 * although one packet has been transfered.
287 */ 287 */
288 if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) { 288 if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) {
289 unsigned int i = 0, valid; 289 unsigned int i = 0;
290 while (pluto->dma_buf[i] == 0x47) 290 while (pluto->dma_buf[i] == 0x47)
291 i += 188; 291 i += 188;
292 valid = i / 188; 292 nbpackets = i / 188;
293 if (nbpackets != valid) {
294 dev_err(&pluto->pdev->dev, "nbpackets=%u valid=%u\n",
295 nbpackets, valid);
296 nbpackets = valid;
297 }
298 } 293 }
299 294
300 dvb_dmx_swfilter_packets(&pluto->demux, pluto->dma_buf, nbpackets); 295 dvb_dmx_swfilter_packets(&pluto->demux, pluto->dma_buf, nbpackets);