← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/features/all/mantis/0016-V4L-DVB-13714-MB86A16-FIX-Code-simplification-use-hw.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/features/all/mantis/0016-V4L-DVB-13714-MB86A16-FIX-Code-simplification-use-hw.patch
1
 
From fb7e4ac1badaa9f12f3825caeb391dcb95b3bd9b Mon Sep 17 00:00:00 2001
2
 
From: Manu Abraham <abraham.manu@gmail.com>
3
 
Date: Thu, 3 Dec 2009 05:44:38 -0300
4
 
Subject: [PATCH 016/120] V4L/DVB (13714): [MB86A16] FIX/Code simplification: use hwconfig->ts_size instead of ts_size
5
 
MIME-Version: 1.0
6
 
Content-Type: text/plain; charset=UTF-8
7
 
Content-Transfer-Encoding: 8bit
8
 
 
9
 
thanks to Marko Ristola for pointing it out
10
 
 
11
 
Signed-off-by: Manu Abraham <manu@linuxtv.org>
12
 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13
 
(cherry picked from commit 33c79630dd9fb7658dbb885a22e3a8127b16a38a)
14
 
 
15
 
Signed-off-by: Bjørn Mork <bjorn@mork.no>
16
 
---
17
 
 drivers/media/dvb/mantis/mantis_common.h |    1 -
18
 
 drivers/media/dvb/mantis/mantis_dma.c    |    4 ++--
19
 
 drivers/media/dvb/mantis/mantis_dvb.c    |    1 -
20
 
 3 files changed, 2 insertions(+), 4 deletions(-)
21
 
 
22
 
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
23
 
index e354e76..d4865e4 100644
24
 
--- a/drivers/media/dvb/mantis/mantis_common.h
25
 
+++ b/drivers/media/dvb/mantis/mantis_common.h
26
 
@@ -92,7 +92,6 @@ struct mantis_pci {
27
 
        u8                      revision;
28
 
 
29
 
        unsigned int            num;
30
 
-       u16                     ts_size;
31
 
 
32
 
        /*      RISC Core               */
33
 
        u32                     finished_block;
34
 
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
35
 
index e207870..ea23a89 100644
36
 
--- a/drivers/media/dvb/mantis/mantis_dma.c
37
 
+++ b/drivers/media/dvb/mantis/mantis_dma.c
38
 
@@ -190,7 +190,6 @@ void mantis_dma_start(struct mantis_pci *mantis)
39
 
 
40
 
        mantis_risc_program(mantis);
41
 
        mmwrite(cpu_to_le32(mantis->risc_dma), MANTIS_RISC_START);
42
 
-//     mmwrite(MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR);
43
 
        mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR);
44
 
 
45
 
        mmwrite(0, MANTIS_DMA_CTL);
46
 
@@ -227,12 +226,13 @@ void mantis_dma_stop(struct mantis_pci *mantis)
47
 
 void mantis_dma_xfer(unsigned long data)
48
 
 {
49
 
        struct mantis_pci *mantis = (struct mantis_pci *) data;
50
 
+       struct mantis_hwconfig *config = mantis->hwconfig;
51
 
 
52
 
        while (mantis->last_block != mantis->finished_block) {
53
 
                dprintk(verbose, MANTIS_DEBUG, 1, "last block=[%d] finished block=[%d]",
54
 
                        mantis->last_block, mantis->finished_block);
55
 
 
56
 
-               (mantis->ts_size ? dvb_dmx_swfilter_204: dvb_dmx_swfilter)
57
 
+               (config->ts_size ? dvb_dmx_swfilter_204: dvb_dmx_swfilter)
58
 
                (&mantis->demux, &mantis->buf_cpu[mantis->last_block * MANTIS_BLOCK_BYTES], MANTIS_BLOCK_BYTES);
59
 
                mantis->last_block = (mantis->last_block + 1) % MANTIS_BLOCK_COUNT;
60
 
        }
61
 
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
62
 
index 319bb8b..7fe8541 100644
63
 
--- a/drivers/media/dvb/mantis/mantis_dvb.c
64
 
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
65
 
@@ -142,7 +142,6 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
66
 
        mantis->demux.start_feed = mantis_dvb_start_feed;
67
 
        mantis->demux.stop_feed = mantis_dvb_stop_feed;
68
 
        mantis->demux.write_to_decoder = NULL;
69
 
-       mantis->ts_size = 1; //188
70
 
        dprintk(verbose, MANTIS_DEBUG, 1, "dvb_dmx_init");
71
 
        if ((result = dvb_dmx_init(&mantis->demux)) < 0) {
72
 
                dprintk(verbose, MANTIS_ERROR, 1,
73
 
1.7.1
74