2 files changed, 14 insertions, 7 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index aeba26dc0a37..fa6d398e97b9 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1493,10 +1493,16 @@ static const struct cx88_board cx88_boards[] = {
                 },
         },
         [CX88_BOARD_POWERCOLOR_REAL_ANGEL] = {
-                .name           = "PowerColor Real Angel 330",
+                .name           = "PowerColor RA330",   /* Long names may confuse LIRC. */
                 .tuner_type     = TUNER_XC2028,
                 .tuner_addr     = 0x61,
                 .input          = { {
+                        .type   = CX88_VMUX_DEBUG,
+                        .vmux   = 3,            /* Due to the way the cx88 driver is written,   */
+                        .gpio0 = 0x00ff,        /* there is no way to deactivate audio pass-    */
+                        .gpio1 = 0xf39d,        /* through without this entry. Furthermore, if  */
+                        .gpio3 = 0x0000,        /* the TV mux entry is first, you get audio     */
+                }, {                            /* from the tuner on boot for a little while.   */
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
                         .gpio0 = 0x00ff,
@@ -2424,8 +2430,9 @@ void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl)
 
         switch (core->boardnr) {
         case CX88_BOARD_POWERCOLOR_REAL_ANGEL:
-                /* Doesn't work with firmware version 2.7 */
-                ctl->fname = "xc3028-v25.fw";
+                /* Now works with firmware version 2.7 */
+                if (core->i2c_algo.udelay < 16)
+                        core->i2c_algo.udelay = 16;
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
                 ctl->scode_table = XC3028_FE_ZARLINK456;
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index c4d1aff1fdb4..60eeda3057e9 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -70,7 +70,7 @@ static DEFINE_MUTEX(devlist);
 
 /* @lpi: lines per IRQ, or 0 to not generate irqs. Note: IRQ to be
          generated _after_ lpi lines are transferred. */
-static u32* cx88_risc_field(u32 *rp, struct scatterlist *sglist,
+static __le32* cx88_risc_field(__le32 *rp, struct scatterlist *sglist,
                             unsigned int offset, u32 sync_line,
                             unsigned int bpl, unsigned int padding,
                             unsigned int lines, unsigned int lpi)
@@ -130,7 +130,7 @@ int cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
                      unsigned int bpl, unsigned int padding, unsigned int lines)
 {
         u32 instructions,fields;
-        u32 *rp;
+        __le32 *rp;
         int rc;
 
         fields = 0;
@@ -168,7 +168,7 @@ int cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
                          unsigned int lines, unsigned int lpi)
 {
         u32 instructions;
-        u32 *rp;
+        __le32 *rp;
         int rc;
 
         /* estimate risc mem: worst case is one write per page border +
@@ -193,7 +193,7 @@ int cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
                       u32 reg, u32 mask, u32 value)
 {
-        u32 *rp;
+        __le32 *rp;
         int rc;
 
         if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) < 0)