49 files changed, 381 insertions, 142 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 6eaece96524..d1e8df18722 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -152,9 +152,22 @@ config BLK_DEV_IDEDISK
           If unsure, say Y.
 
 config IDEDISK_MULTI_MODE
-        bool "Use multi-mode by default"
-        help
-          If you get this error, try to say Y here:
+        bool "Use multiple sector mode for Programmed Input/Output by default"
+        help
+          This setting is irrelevant for most IDE disks, with direct memory
+          access, to which multiple sector mode does not apply. Multiple sector
+          mode is a feature of most modern IDE hard drives, permitting the
+          transfer of multiple sectors per Programmed Input/Output interrupt,
+          rather than the usual one sector per interrupt. When this feature is
+          enabled, it can reduce operating system overhead for disk Programmed
+          Input/Output. On some systems, it also can increase the data
+          throughput of Programmed Input/Output. Some drives, however, seemed
+          to run slower with multiple sector mode enabled. Some drives claimed
+          to support multiple sector mode, but lost data at some settings.
+          Under rare circumstances, such failures could result in massive
+          filesystem corruption.
+
+          If you get the following error, try to say Y here:
 
           hda: set_multmode: status=0x51 { DriveReady SeekComplete Error }
           hda: set_multmode: error=0x04 { DriveStatusError }
@@ -380,9 +393,10 @@ config IDEPCI_SHARE_IRQ
 config IDEPCI_PCIBUS_ORDER
         def_bool BLK_DEV_IDE=y && BLK_DEV_IDEPCI
 
+# TODO: split it on per host driver config options (or module parameters)
 config BLK_DEV_OFFBOARD
         bool "Boot off-board chipsets first support"
-        depends on BLK_DEV_IDEPCI
+        depends on BLK_DEV_IDEPCI && (BLK_DEV_AEC62XX || BLK_DEV_GENERIC || BLK_DEV_HPT34X || BLK_DEV_HPT366 || BLK_DEV_PDC202XX_NEW || BLK_DEV_PDC202XX_OLD || BLK_DEV_TC86C001)
         help
           Normally, IDE controllers built into the motherboard (on-board
           controllers) are assigned to ide0 and ide1 while those on add-in PCI
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 428f7a8a00b..e3add70b9cd 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -340,7 +340,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
 
         if (drive->media != ide_disk) {
                 if (hwif->host_flags & IDE_HFLAG_NO_ATAPI_DMA)
-                        return -1;
+                        return 0;
         }
 
         /*
@@ -752,7 +752,8 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)
                         mode = XFER_MW_DMA_1;
         }
 
-        printk(KERN_DEBUG "%s: selected mode 0x%x\n", drive->name, mode);
+        printk(KERN_DEBUG "%s: %s mode selected\n", drive->name,
+                          mode ? ide_xfer_verbose(mode) : "no DMA");
 
         return min(mode, req_mode);
 }
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c89f0d3058e..755011827af 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -340,6 +340,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                 if (args) {
                         args[0] = stat;
                         args[1] = err;
+                        /* be sure we're looking at the low order bits */
+                        hwif->OUTB(drive->ctl & ~0x80, IDE_CONTROL_REG);
                         args[2] = hwif->INB(IDE_NSECTOR_REG);
                         args[3] = hwif->INB(IDE_SECTOR_REG);
                         args[4] = hwif->INB(IDE_LCYL_REG);
@@ -654,7 +656,8 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
         int retries = 10;
 
         local_irq_enable_in_hardirq();
-        if ((stat & DRQ_STAT) && args && args[3]) {
+        if (rq->cmd_type == REQ_TYPE_ATA_CMD &&
+            (stat & DRQ_STAT) && args && args[3]) {
                 u8 io_32bit = drive->io_32bit;
                 drive->io_32bit = 0;
                 hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS);
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index dcda0f109df..e17a9ee120e 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -403,8 +403,12 @@ void ide_fix_driveid (struct hd_driveid *id)
 #endif
 }
 
-/* FIXME: exported for use by the USB storage (isd200.c) code only */
-EXPORT_SYMBOL(ide_fix_driveid);
+/*
+ * ide_fixstring() cleans up and (optionally) byte-swaps a text string,
+ * removing leading/trailing blanks and compressing internal blanks.
+ * It is primarily used to tidy up the model name/number fields as
+ * returned by the WIN_[P]IDENTIFY commands.
+ */
 
 void ide_fixstring (u8 *s, const int bytecount, const int byteswap)
 {
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 6a6f2e066b4..56fb0b84342 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -172,11 +172,12 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
         ide_fixstring(id->fw_rev,    sizeof(id->fw_rev),    bswap);
         ide_fixstring(id->serial_no, sizeof(id->serial_no), bswap);
 
+        /* we depend on this a lot! */
+        id->model[sizeof(id->model)-1] = '\0';
+
         if (strstr(id->model, "E X A B Y T E N E S T"))
                 goto err_misc;
 
-        /* we depend on this a lot! */
-        id->model[sizeof(id->model)-1] = '\0';
         printk("%s: %s, ", drive->name, id->model);
         drive->present = 1;
         drive->dead = 0;
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index d066546f283..2b60f1b0437 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -471,6 +471,7 @@ static int ide_diag_taskfile(ide_drive_t *drive, ide_task_t *args, unsigned long
         struct request rq;
 
         memset(&rq, 0, sizeof(rq));
+        rq.ref_count = 1;
         rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
         rq.buffer = buf;
 
@@ -511,6 +512,7 @@ int ide_raw_taskfile (ide_drive_t *drive, ide_task_t *args, u8 *buf)
 
 EXPORT_SYMBOL(ide_raw_taskfile);
 
+#ifdef CONFIG_IDE_TASK_IOCTL
 int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
         ide_task_request_t      *req_task;
@@ -660,6 +662,7 @@ abort:
 
         return err;
 }
+#endif
 
 int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors, u8 *buf)
 {
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 9329d4a810e..63625a0be71 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -302,6 +302,7 @@ struct ich_laptop {
 
 static const struct ich_laptop ich_laptop[] = {
         /* devid, subvendor, subdev */
+        { 0x27DF, 0x1025, 0x0102 },     /* ICH7 on Acer 5602aWLMi */
         { 0x27DF, 0x0005, 0x0280 },     /* ICH7 on Acer 5602WLMi */
         { 0x27DF, 0x1025, 0x0110 },     /* ICH7 on Acer 3682WLMi */
         { 0x27DF, 0x1043, 0x1267 },     /* ICH7 on Asus W5F */
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index a3b945ac325..7832d8ba8e4 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -109,7 +109,7 @@ config HISAX_16_3
 
 config HISAX_TELESPCI
         bool "Teles PCI"
-        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+        depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
         help
           This enables HiSax support for the Teles PCI.
           See <file:Documentation/isdn/README.HiSax> on how to configure it.
@@ -237,7 +237,7 @@ config HISAX_MIC
 
 config HISAX_NETJET
         bool "NETjet card"
-        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+        depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
         help
           This enables HiSax support for the NetJet from Traverse
           Technologies.
@@ -248,7 +248,7 @@ config HISAX_NETJET
 
 config HISAX_NETJET_U
         bool "NETspider U card"
-        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+        depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
         help
           This enables HiSax support for the Netspider U interface ISDN card
           from Traverse Technologies.
@@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR
 
 config HISAX_BKM_A4T
         bool "Telekom A4T card"
-        depends on PCI
+        depends on PCI && PCI_LEGACY
         help
           This enables HiSax support for the Telekom A4T card.
 
@@ -297,7 +297,7 @@ config HISAX_BKM_A4T
 
 config HISAX_SCT_QUADRO
         bool "Scitel Quadro card"
-        depends on PCI
+        depends on PCI && PCI_LEGACY
         help
           This enables HiSax support for the Scitel Quadro card.
 
@@ -316,7 +316,7 @@ config HISAX_GAZEL
 
 config HISAX_HFC_PCI
         bool "HFC PCI-Bus cards"
-        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+        depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
         help
           This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
 
@@ -325,7 +325,7 @@ config HISAX_HFC_PCI
 
 config HISAX_W6692
         bool "Winbond W6692 based cards"
-        depends on PCI
+        depends on PCI && PCI_LEGACY
         help
           This enables HiSax support for Winbond W6692 based PCI ISDN cards.
 
@@ -341,7 +341,7 @@ config HISAX_HFC_SX
 
 config HISAX_ENTERNOW_PCI
         bool "Formula-n enter:now PCI card"
-        depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
+        depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
         help
           This enables HiSax support for the Formula-n enter:now PCI
           ISDN card.
@@ -411,7 +411,7 @@ config HISAX_HFC4S8S
 
 config HISAX_FRITZ_PCIPNP
         tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI && PCI_LEGACY && EXPERIMENTAL
         help
           This enables the driver for the AVM Fritz!Card PCI,
           Fritz!Card PCI v2 and Fritz!Card PnP.
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index f8b79783c8b..035d158779d 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -830,7 +830,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
 
 #endif /* __ISAPNP__ */
 
-#ifndef CONFIG_PCI
+#ifndef CONFIG_PCI_LEGACY
 
 static int __devinit avm_pci_setup(struct IsdnCardState *cs)
 {
@@ -872,7 +872,7 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs)
         return (1);
 }
 
-#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI_LEGACY */
 
 int __devinit
 setup_avm_pcipnp(struct IsdnCard *card)
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 82674507874..2d670856d14 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1148,7 +1148,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
 
 #endif  /* ISAPNP */
 
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCI_LEGACY
 static struct pci_dev *dev_diva __devinitdata = NULL;
 static struct pci_dev *dev_diva_u __devinitdata = NULL;
 static struct pci_dev *dev_diva201 __devinitdata = NULL;
@@ -1229,14 +1229,14 @@ static int __devinit setup_diva_pci(struct IsdnCard *card)
         return (1);             /* card found */
 }
 
-#else   /* if !CONFIG_PCI */
+#else   /* if !CONFIG_PCI_LEGACY */
 
 static int __devinit setup_diva_pci(struct IsdnCard *card)
 {
         return (-1);    /* card not found; continue search */
 }
 
-#endif  /* CONFIG_PCI */
+#endif  /* CONFIG_PCI_LEGACY */
 
 int __devinit
 setup_diva(struct IsdnCard *card)
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 948a9b290fd..2b2677ba023 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -1025,7 +1025,7 @@ setup_elsa_pcmcia(struct IsdnCard *card)
                cs->irq);
 }
 
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCI_LEGACY
 static  struct pci_dev *dev_qs1000 __devinitdata = NULL;
 static  struct pci_dev *dev_qs3000 __devinitdata = NULL;
 
@@ -1093,7 +1093,7 @@ setup_elsa_pci(struct IsdnCard *card)
 {
         return (1);
 }
-#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI_LEGACY */
 
 static int __devinit
 setup_elsa_common(struct IsdnCard *card)
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index 3efa719b6d2..f66620ad8e7 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -532,6 +532,7 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
         return (0);
 }
 
+#ifdef CONFIG_PCI_LEGACY
 static struct pci_dev *dev_tel __devinitdata = NULL;
 
 static int __devinit
@@ -620,6 +621,7 @@ setup_gazelpci(struct IsdnCardState *cs)
 
         return (0);
 }
+#endif /* CONFIG_PCI_LEGACY */
 
 int __devinit
 setup_gazel(struct IsdnCard *card)
@@ -639,7 +641,7 @@ setup_gazel(struct IsdnCard *card)
                         return (0);
         } else {
 
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCI_LEGACY
                 if (setup_gazelpci(cs))
                         return (0);
 #else
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index e5918c6fe73..bd9921128aa 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -223,7 +223,6 @@ static int niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg)
         return 0;
 }
 
-static struct pci_dev *niccy_dev __devinitdata = NULL;
 #ifdef __ISAPNP__
 static struct pnp_card *pnp_c __devinitdata = NULL;
 #endif
@@ -299,7 +298,9 @@ int __devinit setup_niccy(struct IsdnCard *card)
                         return 0;
                 }
         } else {
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCI_LEGACY
+                static struct pci_dev *niccy_dev __devinitdata;
+
                 u_int pci_ioaddr;
                 cs->subtyp = 0;
                 if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM,
@@ -356,7 +357,7 @@ int __devinit setup_niccy(struct IsdnCard *card)
                 printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n");
                 printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n");
                 return 0;
-#endif                          /* CONFIG_PCI */
+#endif                          /* CONFIG_PCI_LEGACY */
         }
         printk(KERN_INFO "HiSax: %s %s config irq:%d data:0x%X ale:0x%X\n",
                 CardType[cs->typ], (cs->subtyp == 1) ? "PnP" : "PCI",
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 03dfc32166a..95425f3d222 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -600,7 +600,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
 }
 #endif /* __ISAPNP__ */
 
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCI_LEGACY
 static struct pci_dev *dev_sedl __devinitdata = NULL;
 
 static int __devinit
@@ -675,7 +675,7 @@ setup_sedlbauer_pci(struct IsdnCard *card)
         return (1);
 }
 
-#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI_LEGACY */
 
 int __devinit
 setup_sedlbauer(struct IsdnCard *card)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index dd9bd4310c8..1604f049040 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -151,6 +151,7 @@ config VIDEO_IR_I2C
 
 config VIDEO_IR
         tristate
+        depends on INPUT
         select VIDEO_IR_I2C if I2C
 
 config VIDEO_TVEEPROM
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index cb034ead95a..7d04a6fd1ac 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -59,43 +59,89 @@ void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data)
 }
 
 /* This DEBI code is based on the saa7146 Stradis driver by Nathan Laredo */
-int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop)
+static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
+                                unsigned long us1, unsigned long us2)
 {
-        unsigned long start;
+        unsigned long timeout;
         int err;
 
         /* wait for registers to be programmed */
-        start = jiffies;
+        timeout = jiffies + usecs_to_jiffies(us1);
         while (1) {
-                err = time_after(jiffies, start + HZ/20);
+                err = time_after(jiffies, timeout);
                 if (saa7146_read(dev, MC2) & 2)
                         break;
                 if (err) {
-                        DEB_S(("timed out while waiting for registers getting programmed\n"));
+                        printk(KERN_ERR "%s: %s timed out while waiting for "
+                                        "registers getting programmed\n",
+                                        dev->name, __FUNCTION__);
                         return -ETIMEDOUT;
                 }
-                if (nobusyloop)
-                        msleep(1);
+                msleep(1);
         }
 
         /* wait for transfer to complete */
-        start = jiffies;
+        timeout = jiffies + usecs_to_jiffies(us2);
         while (1) {
-                err = time_after(jiffies, start + HZ/4);
+                err = time_after(jiffies, timeout);
                 if (!(saa7146_read(dev, PSR) & SPCI_DEBI_S))
                         break;
                 saa7146_read(dev, MC2);
                 if (err) {
-                        DEB_S(("timed out while waiting for transfer completion\n"));
+                        DEB_S(("%s: %s timed out while waiting for transfer "
+                                "completion\n", dev->name, __FUNCTION__));
                         return -ETIMEDOUT;
                 }
-                if (nobusyloop)
-                        msleep(1);
+                msleep(1);
         }
 
         return 0;
 }
 
+static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
+                                unsigned long us1, unsigned long us2)
+{
+        unsigned long loops;
+
+        /* wait for registers to be programmed */
+        loops = us1;
+        while (1) {
+                if (saa7146_read(dev, MC2) & 2)
+                        break;
+                if (!loops--) {
+                        printk(KERN_ERR "%s: %s timed out while waiting for "
+                                        "registers getting programmed\n",
+                                        dev->name, __FUNCTION__);
+                        return -ETIMEDOUT;
+                }
+                udelay(1);
+        }
+
+        /* wait for transfer to complete */
+        loops = us2 / 5;
+        while (1) {
+                if (!(saa7146_read(dev, PSR) & SPCI_DEBI_S))
+                        break;
+                saa7146_read(dev, MC2);
+                if (!loops--) {
+                        DEB_S(("%s: %s timed out while waiting for transfer "
+                                "completion\n", dev->name, __FUNCTION__));
+                        return -ETIMEDOUT;
+                }
+                udelay(5);
+        }
+
+        return 0;
+}
+
+int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop)
+{
+        if (nobusyloop)
+                return saa7146_wait_for_debi_done_sleep(dev, 50000, 250000);
+        else
+                return saa7146_wait_for_debi_done_busyloop(dev, 50000, 250000);
+}
+
 /****************************************************************************
  * general helper functions
  ****************************************************************************/
diff --git a/drivers/media/dvb/frontends/mt2131.c b/drivers/media/dvb/frontends/mt2131.c
index 4b93931de4e..13cf1666817 100644
--- a/drivers/media/dvb/frontends/mt2131.c
+++ b/drivers/media/dvb/frontends/mt2131.c
@@ -116,7 +116,7 @@ static int mt2131_set_params(struct dvb_frontend *fe,
         f_lo1 = (f_lo1 / 250) * 250;
         f_lo2 = f_lo1 - freq - MT2131_IF2;
 
-        priv->frequency =  (f_lo1 - f_lo2 - MT2131_IF2) * 1000,
+        priv->frequency =  (f_lo1 - f_lo2 - MT2131_IF2) * 1000;
 
         /* Frequency LO1 = 16MHz * (DIV1 + NUM1/8192 ) */
         num1 = f_lo1 * 64 / (MT2131_FREF / 128);
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 30e8a705fad..8dee7ec9456 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -42,6 +42,9 @@ struct s5h1409_state {
         fe_modulation_t current_modulation;
 
         u32 current_frequency;
+
+        u32 is_qam_locked;
+        u32 qam_state;
 };
 
 static int debug = 0;
@@ -94,6 +97,7 @@ static struct init_tab {
         { 0xac, 0x1003, },
         { 0xad, 0x103f, },
         { 0xe2, 0x0100, },
+        { 0xe3, 0x0000, },
         { 0x28, 0x1010, },
         { 0xb1, 0x000e, },
 };
@@ -335,6 +339,8 @@ static int s5h1409_softreset(struct dvb_frontend* fe)
 
         s5h1409_writereg(state, 0xf5, 0);
         s5h1409_writereg(state, 0xf5, 1);
+        state->is_qam_locked = 0;
+        state->qam_state = 0;
         return 0;
 }
 
@@ -349,6 +355,11 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)
                 s5h1409_writereg(state, 0x87, 0x01be);
                 s5h1409_writereg(state, 0x88, 0x0436);
                 s5h1409_writereg(state, 0x89, 0x054d);
+        } else
+        if (KHz == 4000) {
+                s5h1409_writereg(state, 0x87, 0x014b);
+                s5h1409_writereg(state, 0x88, 0x0cb5);
+                s5h1409_writereg(state, 0x89, 0x03e2);
         } else {
                 printk("%s() Invalid arg = %d KHz\n", __FUNCTION__, KHz);
                 ret = -1;
@@ -361,7 +372,7 @@ static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted)
 {
         struct s5h1409_state* state = fe->demodulator_priv;
 
-        dprintk("%s()\n", __FUNCTION__);
+        dprintk("%s(%d)\n", __FUNCTION__, inverted);
 
         if(inverted == 1)
                 return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */
@@ -382,14 +393,10 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,
                 s5h1409_writereg(state, 0xf4, 0);
                 break;
         case QAM_64:
-                dprintk("%s() QAM_64\n", __FUNCTION__);
-                s5h1409_writereg(state, 0xf4, 1);
-                s5h1409_writereg(state, 0x85, 0x100);
-                break;
         case QAM_256:
-                dprintk("%s() QAM_256\n", __FUNCTION__);
+                dprintk("%s() QAM_AUTO (64/256)\n", __FUNCTION__);
                 s5h1409_writereg(state, 0xf4, 1);
-                s5h1409_writereg(state, 0x85, 0x101);
+                s5h1409_writereg(state, 0x85, 0x110);
                 break;
         default:
                 dprintk("%s() Invalid modulation\n", __FUNCTION__);
@@ -423,7 +430,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
         if (enable)
                 return s5h1409_writereg(state, 0xe3, 0x1100);
         else
-                return s5h1409_writereg(state, 0xe3, 0);
+                return s5h1409_writereg(state, 0xe3, 0x1000);
 }
 
 static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
@@ -444,6 +451,66 @@ static int s5h1409_register_reset(struct dvb_frontend* fe)
         return s5h1409_writereg(state, 0xfa, 0);
 }
 
+static void s5h1409_set_qam_amhum_mode(struct dvb_frontend *fe)
+{
+        struct s5h1409_state *state = fe->demodulator_priv;
+        u16 reg;
+
+        if (state->is_qam_locked)
+                return;
+
+        /* QAM EQ lock check */
+        reg = s5h1409_readreg(state, 0xf0);
+
+        if ((reg >> 13) & 0x1) {
+
+                state->is_qam_locked = 1;
+                reg &= 0xff;
+
+                s5h1409_writereg(state, 0x96, 0x00c);
+                if ((reg < 0x38) || (reg > 0x68) ) {
+                        s5h1409_writereg(state, 0x93, 0x3332);
+                        s5h1409_writereg(state, 0x9e, 0x2c37);
+                } else {
+                        s5h1409_writereg(state, 0x93, 0x3130);
+                        s5h1409_writereg(state, 0x9e, 0x2836);
+                }
+
+        } else {
+                s5h1409_writereg(state, 0x96, 0x0008);
+                s5h1409_writereg(state, 0x93, 0x3332);
+                s5h1409_writereg(state, 0x9e, 0x2c37);
+        }
+}
+
+static void s5h1409_set_qam_interleave_mode(struct dvb_frontend *fe)
+{
+        struct s5h1409_state *state = fe->demodulator_priv;
+        u16 reg, reg1, reg2;
+
+        reg = s5h1409_readreg(state, 0xf1);
+
+        /* Master lock */
+        if ((reg >> 15) & 0x1) {
+                if (state->qam_state != 2) {
+                        state->qam_state = 2;
+                        reg1 = s5h1409_readreg(state, 0xb2);
+                        reg2 = s5h1409_readreg(state, 0xad);
+
+                        s5h1409_writereg(state, 0x96, 0x20);
+                        s5h1409_writereg(state, 0xad,
+                                ( ((reg1 & 0xf000) >> 4) | (reg2 & 0xf0ff)) );
+                        s5h1409_writereg(state, 0xab, 0x1100);
+                }
+        } else {
+                if (state->qam_state != 1) {
+                        state->qam_state = 1;
+                        s5h1409_writereg(state, 0x96, 0x08);
+                        s5h1409_writereg(state, 0xab, 0x1101);
+                }
+        }
+}
+
 /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
 static int s5h1409_set_frontend (struct dvb_frontend* fe,
                                  struct dvb_frontend_parameters *p)
@@ -458,12 +525,21 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe,
 
         s5h1409_enable_modulation(fe, p->u.vsb.modulation);
 
+        /* Allow the demod to settle */
+        msleep(100);
+
         if (fe->ops.tuner_ops.set_params) {
                 if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1);
                 fe->ops.tuner_ops.set_params(fe, p);
                 if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
+        /* Optimize the demod for QAM */
+        if (p->u.vsb.modulation != VSB_8) {
+                s5h1409_set_qam_amhum_mode(fe);
+                s5h1409_set_qam_interleave_mode(fe);
+        }
+
         return 0;
 }
 
@@ -495,8 +571,8 @@ static int s5h1409_init (struct dvb_frontend* fe)
         s5h1409_set_gpio(fe, state->config->gpio);
         s5h1409_softreset(fe);
 
-        /* Note: Leaving the I2C gate open here. */
-        s5h1409_i2c_gate_ctrl(fe, 1);
+        /* Note: Leaving the I2C gate closed. */
+        s5h1409_i2c_gate_ctrl(fe, 0);
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 17e5cb561cd..7c23775f77d 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -358,11 +358,23 @@ static int stv0297_read_ber(struct dvb_frontend *fe, u32 * ber)
 static int stv0297_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
 {
         struct stv0297_state *state = fe->demodulator_priv;
-        u8 STRENGTH[2];
-
-        stv0297_readregs(state, 0x41, STRENGTH, 2);
-        *strength = (STRENGTH[1] & 0x03) << 8 | STRENGTH[0];
-
+        u8 STRENGTH[3];
+        u16 tmp;
+
+        stv0297_readregs(state, 0x41, STRENGTH, 3);
+        tmp = (STRENGTH[1] & 0x03) << 8 | STRENGTH[0];
+        if (STRENGTH[2] & 0x20) {
+                if (tmp < 0x200)
+                        tmp = 0;
+                else
+                        tmp = tmp - 0x200;
+        } else {
+                if (tmp > 0x1ff)
+                        tmp = 0;
+                else
+                        tmp = 0x1ff - tmp;
+        }
+        *strength = (tmp << 7) | (tmp >> 2);
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 4cd9e82c466..45137d2ebfb 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -301,6 +301,8 @@ static int tda10021_read_ber(struct dvb_frontend* fe, u32* ber)
         u32 _ber = tda10021_readreg(state, 0x14) |
                 (tda10021_readreg(state, 0x15) << 8) |
                 ((tda10021_readreg(state, 0x16) & 0x0f) << 16);
+        _tda10021_writereg(state, 0x10, (tda10021_readreg(state, 0x10) & ~0xc0)
+                                        | (tda10021_inittab[0x10] & 0xc0));
         *ber = 10 * _ber;
 
         return 0;
@@ -310,7 +312,11 @@ static int tda10021_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
         struct tda10021_state* state = fe->demodulator_priv;
 
+        u8 config = tda10021_readreg(state, 0x02);
         u8 gain = tda10021_readreg(state, 0x17);
+        if (config & 0x02)
+                /* the agc value is inverted */
+                gain = ~gain;
         *strength = (gain << 8) | gain;
 
         return 0;
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 066b73b7569..60433b5011f 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -47,7 +47,7 @@ struct ves1820_state {
 static int verbose;
 
 static u8 ves1820_inittab[] = {
-        0x69, 0x6A, 0x93, 0x12, 0x12, 0x46, 0x26, 0x1A,
+        0x69, 0x6A, 0x93, 0x1A, 0x12, 0x46, 0x26, 0x1A,
         0x43, 0x6A, 0xAA, 0xAA, 0x1E, 0x85, 0x43, 0x20,
         0xE0, 0x00, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 6d53289b327..54b91f26ca6 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -84,7 +84,7 @@ config DVB_BUDGET
 
 config DVB_BUDGET_CI
         tristate "Budget cards with onboard CI connector"
-        depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+        depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && INPUT
         select VIDEO_SAA7146
         select DVB_STV0297 if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 2e571eb9313..c9f14bfc854 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -363,7 +363,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
-        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
+        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
         select VIDEOBUF_VMALLOC
         default n
         ---help---
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 9feeb636ff9..a88b56e6ca0 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2881,10 +2881,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 if (NULL == fmt)
                         return -EINVAL;
                 mutex_lock(&fh->cap.lock);
-                if (fmt->depth != pic->depth) {
-                        retval = -EINVAL;
-                        goto fh_unlock_and_return;
-                }
                 if (fmt->flags & FORMAT_FLAGS_RAW) {
                         /* VIDIOCMCAPTURE uses gbufsize, not RAW_BPL *
                            RAW_LINES * 2. F1 is stored at offset 0, F2
@@ -3117,6 +3113,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                                              vm->width,vm->height,field);
                 if (0 != retval)
                         goto fh_unlock_and_return;
+                btv->init.width = vm->width;
+                btv->init.height = vm->height;
                 spin_lock_irqsave(&btv->s_lock,flags);
                 buffer_queue(&fh->cap,&buf->vb);
                 spin_unlock_irqrestore(&btv->s_lock,flags);
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index b63cab33692..7ae499c9c54 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -3,6 +3,9 @@
  * multifunction chip.  Currently works with the Omnivision OV7670
  * sensor.
  *
+ * The data sheet for this device can be found at:
+ *    http://www.marvell.com/products/pcconn/88ALP01.jsp
+ *
  * Copyright 2006 One Laptop Per Child Association, Inc.
  * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net>
  *
@@ -2232,13 +2235,16 @@ static int cafe_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct cafe_camera *cam = cafe_find_by_pdev(pdev);
         int ret;
+        enum cafe_state cstate;
 
         ret = pci_save_state(pdev);
         if (ret)
                 return ret;
+        cstate = cam->state; /* HACK - stop_dma sets to idle */
         cafe_ctlr_stop_dma(cam);
         cafe_ctlr_power_down(cam);
         pci_disable_device(pdev);
+        cam->state = cstate;
         return 0;
 }
 
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index 72004a07b2d..d8b1ccb4491 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_CX23885
         tristate "Conexant cx23885 (2388x successor) support"
-        depends on DVB_CORE && VIDEO_DEV && PCI && I2C
+        depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index eeb5224ca10..ceb31d4a251 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_CX88
         tristate "Conexant 2388x (bt878 successor) support"
-        depends on VIDEO_DEV && PCI && I2C
+        depends on VIDEO_DEV && PCI && I2C && INPUT
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 5b6a4037160..c1127802ad9 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_EM28XX
         tristate "Empia EM2800/2820/2840 USB video capture support"
-        depends on VIDEO_V4L1 && I2C
+        depends on VIDEO_V4L1 && I2C && INPUT
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 997d067e32e..e3a4aa7a9df 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -416,8 +416,10 @@ static int attach_inform(struct i2c_client *client)
         struct em28xx *dev = client->adapter->algo_data;
 
         switch (client->addr << 1) {
-                case 0x43:
-                case 0x4b:
+                case 0x86:
+                case 0x84:
+                case 0x96:
+                case 0x94:
                 {
                         struct tuner_setup tun_setup;
 
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a4c2a907124..2529c298b86 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -32,6 +32,7 @@
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/version.h>
+#include <linux/mm.h>
 #include <linux/video_decoder.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index ce4b2f9791e..36047d4e70f 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -91,7 +91,6 @@ static void planb_close(struct video_device *);
 static int planb_ioctl(struct video_device *, unsigned int, void *);
 static int planb_init_done(struct video_device *);
 static int planb_mmap(struct video_device *, const char *, unsigned long);
-static void planb_irq(int, void *);
 static void release_planb(void);
 int init_planbs(struct video_init *);
 
@@ -1315,7 +1314,7 @@ cmd_tab_data_end:
         return c1;
 }
 
-static void planb_irq(int irq, void *dev_id)
+static irqreturn_t planb_irq(int irq, void *dev_id)
 {
         unsigned int stat, astat;
         struct planb *pb = (struct planb *)dev_id;
@@ -1358,13 +1357,14 @@ static void planb_irq(int irq, void *dev_id)
                 pb->frame_stat[fr] = GBUFFER_DONE;
                 pb->grabbing--;
                 wake_up_interruptible(&pb->capq);
-                return;
+                return IRQ_HANDLED;
         }
         /* incorrect interrupts? */
         pb->intr_mask = PLANB_CLR_IRQ;
         out_le32(&pb->planb_base->intr_stat, PLANB_CLR_IRQ);
         printk(KERN_ERR "PlanB: IRQ lockup, cleared intrrupts"
                                                         " unconditionally\n");
+        return IRQ_HANDLED;
 }
 
 /*******************************
@@ -2090,7 +2090,7 @@ static int init_planb(struct planb *pb)
         /* clear interrupt mask */
         pb->intr_mask = PLANB_CLR_IRQ;
 
-        result = request_irq(pb->irq, planb_irq, 0, "PlanB", (void *)pb);
+        result = request_irq(pb->irq, planb_irq, 0, "PlanB", pb);
         if (result < 0) {
                 if (result==-EINVAL)
                         printk(KERN_ERR "PlanB: Bad irq number (%d) "
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index f569b00201d..46f156fb108 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -410,7 +410,7 @@ static int parse_mtoken(const char *ptr,unsigned int len,
         int msk;
         *valptr = 0;
         for (idx = 0, msk = 1; valid_bits; idx++, msk <<= 1) {
-                if (!msk & valid_bits) continue;
+                if (!(msk & valid_bits)) continue;
                 valid_bits &= ~msk;
                 if (!names[idx]) continue;
                 slen = strlen(names[idx]);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index ca9e2789c8c..11b3b2e84b9 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -136,14 +136,13 @@ static int __init pvr_init(void)
 
 static void __exit pvr_exit(void)
 {
-
         pvr2_trace(PVR2_TRACE_INIT,"pvr_exit");
 
+        usb_deregister(&pvr_driver);
+
 #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
         pvr2_sysfs_class_destroy(class_ptr);
 #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */
-
-        usb_deregister(&pvr_driver);
 }
 
 module_init(pvr_init);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 2ee3c3049e8..3c57a7d8200 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -905,13 +905,6 @@ struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *mp,
 }
 
 
-static int pvr2_sysfs_hotplug(struct device *d,
-                              struct kobj_uevent_env *env)
-{
-        /* Even though we don't do anything here, we still need this function
-           because sysfs will still try to call it. */
-        return 0;
-}
 
 struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)
 {
@@ -922,7 +915,6 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)
         clp->class.name = "pvrusb2";
         clp->class.class_release = pvr2_sysfs_class_release;
         clp->class.dev_release = pvr2_sysfs_release;
-        clp->class.dev_uevent = pvr2_sysfs_hotplug;
         if (class_register(&clp->class)) {
                 pvr2_sysfs_trace(
                         "Registration failed for pvr2_sysfs_class id=%p",clp);
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index d6d8d660196..3aa8cb2b860 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_SAA7134
         tristate "Philips SAA7134 support"
-        depends on VIDEO_DEV && PCI && I2C
+        depends on VIDEO_DEV && PCI && I2C && INPUT
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
         select VIDEO_TUNER
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index c6f7279669c..b9c5cf7dc84 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -543,8 +543,10 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
            V4L functions, and force ALSA to use that as the DMA area */
 
         substream->runtime->dma_area = dev->dmasound.dma.vmalloc;
+        substream->runtime->dma_bytes = dev->dmasound.bufsize;
+        substream->runtime->dma_addr = 0;
 
-        return 1;
+        return 0;
 
 }
 
@@ -652,6 +654,17 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
 }
 
 /*
+ * page callback (needed for mmap)
+ */
+
+static struct page *snd_card_saa7134_page(struct snd_pcm_substream *substream,
+                                        unsigned long offset)
+{
+        void *pageptr = substream->runtime->dma_area + offset;
+        return vmalloc_to_page(pageptr);
+}
+
+/*
  * ALSA capture callbacks definition
  */
 
@@ -664,6 +677,7 @@ static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
         .prepare =              snd_card_saa7134_capture_prepare,
         .trigger =              snd_card_saa7134_capture_trigger,
         .pointer =              snd_card_saa7134_capture_pointer,
+        .page =                 snd_card_saa7134_page,
 };
 
 /*
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index a4c192fb4e4..4f3dad9ae6d 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2996,11 +2996,11 @@ struct saa7134_board saa7134_boards[] = {
                 },{
                         .name   = name_comp1,
                         .vmux   = 0,
-                        .amux   = LINE2,
+                        .amux   = LINE1,
                 },{
                         .name   = name_svideo,
                         .vmux   = 8,
-                        .amux   = LINE2,
+                        .amux   = LINE1,
                 }},
         },
         [SAA7134_BOARD_FLYDVBS_LR300] = {
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 6a777604f07..9e99f3636d3 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -30,7 +30,7 @@
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
-#ifdef CONFIG_TUNER_TEA5761
+#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
         0x10,
 #endif
         0x42, 0x43, 0x4a, 0x4b,                 /* tda8290 */
@@ -292,7 +292,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 }
                 t->mode_mask = T_RADIO;
                 break;
-#ifdef CONFIG_TUNER_TEA5761
         case TUNER_TEA5761:
                 if (tea5761_attach(&t->fe, t->i2c.adapter, t->i2c.addr) == NULL) {
                         t->type = TUNER_ABSENT;
@@ -301,7 +300,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 }
                 t->mode_mask = T_RADIO;
                 break;
-#endif
         case TUNER_PHILIPS_FMD1216ME_MK3:
                 buffer[0] = 0x0b;
                 buffer[1] = 0xdc;
@@ -594,7 +592,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         /* autodetection code based on the i2c addr */
         if (!no_autodetect) {
                 switch (addr) {
-#ifdef CONFIG_TUNER_TEA5761
                 case 0x10:
                         if (tea5761_autodetection(t->i2c.adapter, t->i2c.addr) != EINVAL) {
                                 t->type = TUNER_TEA5761;
@@ -606,7 +603,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
                                 goto register_client;
                         }
                         break;
-#endif
                 case 0x42:
                 case 0x43:
                 case 0x4a:
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index e2f1c972754..25d0aef88ef 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -799,10 +799,10 @@ static inline void tvp5150_reset(struct i2c_client *c)
         tvp5150_write_inittab(c, tvp5150_init_enable);
 
         /* Initialize image preferences */
-        tvp5150_write(c, TVP5150_BRIGHT_CTL, decoder->bright >> 8);
-        tvp5150_write(c, TVP5150_CONTRAST_CTL, decoder->contrast >> 8);
-        tvp5150_write(c, TVP5150_SATURATION_CTL, decoder->contrast >> 8);
-        tvp5150_write(c, TVP5150_HUE_CTL, (decoder->hue - 32768) >> 8);
+        tvp5150_write(c, TVP5150_BRIGHT_CTL, decoder->bright);
+        tvp5150_write(c, TVP5150_CONTRAST_CTL, decoder->contrast);
+        tvp5150_write(c, TVP5150_SATURATION_CTL, decoder->contrast);
+        tvp5150_write(c, TVP5150_HUE_CTL, decoder->hue);
 
         tvp5150_set_std(c, decoder->norm);
 };
@@ -1077,10 +1077,10 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
         core->norm = V4L2_STD_ALL;      /* Default is autodetect */
         core->route.input = TVP5150_COMPOSITE1;
         core->enable = 1;
-        core->bright = 32768;
-        core->contrast = 32768;
-        core->hue = 32768;
-        core->sat = 32768;
+        core->bright = 128;
+        core->contrast = 128;
+        core->hue = 0;
+        core->sat = 128;
 
         if (rv) {
                 kfree(c);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 09440d783e6..cad51991076 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7365,10 +7365,6 @@ static int tg3_open(struct net_device *dev)
                 } else if (pci_enable_msi(tp->pdev) == 0) {
                         u32 msi_mode;
 
-                        /* Hardware bug - MSI won't work if INTX disabled. */
-                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
-                                pci_intx(tp->pdev, 1);
-
                         msi_mode = tr32(MSGINT_MODE);
                         tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
                         tp->tg3_flags2 |= TG3_FLG2_USING_MSI;
@@ -12681,11 +12677,6 @@ static int tg3_resume(struct pci_dev *pdev)
         if (err)
                 return err;
 
-        /* Hardware bug - MSI won't work if INTX disabled. */
-        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) &&
-            (tp->tg3_flags2 & TG3_FLG2_USING_MSI))
-                pci_intx(tp->pdev, 1);
-
         netif_device_attach(dev);
 
         tg3_full_lock(tp, 0);
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 7a1d6d51283..e1ca42591ac 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -21,6 +21,17 @@ config PCI_MSI
 
            If you don't know what to do here, say N.
 
+config PCI_LEGACY
+        bool "Enable deprecated pci_find_* API"
+        depends on PCI
+        default y
+        help
+          Say Y here if you want to include support for the deprecated
+          pci_find_slot() and pci_find_device() APIs.  Most drivers have
+          been converted over to using the proper hotplug APIs, so this
+          option serves to include/exclude only a few drivers that are
+          still using this API.
+
 config PCI_DEBUG
         bool "PCI Debugging"
         depends on PCI && DEBUG_KERNEL
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 63d62752fb9..a64449d489d 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -41,7 +41,7 @@ config HOTPLUG_PCI_FAKE
 
 config HOTPLUG_PCI_COMPAQ
         tristate "Compaq PCI Hotplug driver"
-        depends on X86 && PCI_BIOS
+        depends on X86 && PCI_BIOS && PCI_LEGACY
         help
           Say Y here if you have a motherboard with a Compaq PCI Hotplug
           controller.
@@ -63,7 +63,7 @@ config HOTPLUG_PCI_COMPAQ_NVRAM
 
 config HOTPLUG_PCI_IBM
         tristate "IBM PCI Hotplug driver"
-        depends on X86_IO_APIC && X86 && PCI_BIOS
+        depends on X86_IO_APIC && X86 && PCI_BIOS && PCI_LEGACY
         help
           Say Y here if you have a motherboard with a IBM PCI Hotplug
           controller.
@@ -119,7 +119,7 @@ config HOTPLUG_PCI_CPCI_ZT5550
 
 config HOTPLUG_PCI_CPCI_GENERIC
         tristate "Generic port I/O CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI_CPCI && X86
+        depends on HOTPLUG_PCI_CPCI && X86 && PCI_LEGACY
         help
           Say Y here if you have a CompactPCI system card that exposes the #ENUM
           hotswap signal as a bit in a system register that can be read through
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 3ef0a4875a6..856d57b4d60 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1931,16 +1931,14 @@ void cpqhp_pushbutton_thread(unsigned long slot)
                         return ;
                 }
 
-                if (func != NULL && ctrl != NULL) {
-                        if (cpqhp_process_SS(ctrl, func) != 0) {
-                                amber_LED_on (ctrl, hp_slot);
-                                green_LED_on (ctrl, hp_slot);
-                                
-                                set_SOGO(ctrl);
+                if (cpqhp_process_SS(ctrl, func) != 0) {
+                        amber_LED_on(ctrl, hp_slot);
+                        green_LED_on(ctrl, hp_slot);
 
-                                /* Wait for SOBS to be unset */
-                                wait_for_ctrl_irq (ctrl);
-                        }
+                        set_SOGO(ctrl);
+
+                        /* Wait for SOBS to be unset */
+                        wait_for_ctrl_irq(ctrl);
                 }
 
                 p_slot->state = STATIC_STATE;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 87e01615053..07c9f09c856 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -224,6 +224,12 @@ static struct msi_desc* alloc_msi_entry(void)
         return entry;
 }
 
+static void pci_intx_for_msi(struct pci_dev *dev, int enable)
+{
+        if (!(dev->dev_flags & PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG))
+                pci_intx(dev, enable);
+}
+
 #ifdef CONFIG_PM
 static void __pci_restore_msi_state(struct pci_dev *dev)
 {
@@ -237,7 +243,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
         entry = get_irq_msi(dev->irq);
         pos = entry->msi_attrib.pos;
 
-        pci_intx(dev, 0);               /* disable intx */
+        pci_intx_for_msi(dev, 0);
         msi_set_enable(dev, 0);
         write_msi_msg(dev->irq, &entry->msg);
         if (entry->msi_attrib.maskbit)
@@ -260,7 +266,7 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
                 return;
 
         /* route the table */
-        pci_intx(dev, 0);               /* disable intx */
+        pci_intx_for_msi(dev, 0);
         msix_set_enable(dev, 0);
 
         list_for_each_entry(entry, &dev->msi_list, list) {
@@ -343,7 +349,7 @@ static int msi_capability_init(struct pci_dev *dev)
         }
 
         /* Set MSI enabled bits  */
-        pci_intx(dev, 0);               /* disable intx */
+        pci_intx_for_msi(dev, 0);
         msi_set_enable(dev, 1);
         dev->msi_enabled = 1;
 
@@ -433,7 +439,7 @@ static int msix_capability_init(struct pci_dev *dev,
                 i++;
         }
         /* Set MSI-X enabled bits */
-        pci_intx(dev, 0);               /* disable intx */
+        pci_intx_for_msi(dev, 0);
         msix_set_enable(dev, 1);
         dev->msix_enabled = 1;
 
@@ -528,7 +534,7 @@ void pci_disable_msi(struct pci_dev* dev)
                 return;
 
         msi_set_enable(dev, 0);
-        pci_intx(dev, 1);               /* enable intx */
+        pci_intx_for_msi(dev, 1);
         dev->msi_enabled = 0;
 
         BUG_ON(list_empty(&dev->msi_list));
@@ -640,7 +646,7 @@ void pci_disable_msix(struct pci_dev* dev)
                 return;
 
         msix_set_enable(dev, 0);
-        pci_intx(dev, 1);               /* enable intx */
+        pci_intx_for_msi(dev, 1);
         dev->msix_enabled = 0;
 
         msix_free_all_irqs(dev);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 6e2760b6c20..6d1a2161181 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -143,8 +143,8 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
  * system is in its list of supported devices.  Returns the matching
  * pci_device_id structure or %NULL if there is no match.
  */
-const struct pci_device_id *pci_match_device(struct pci_driver *drv,
-                                             struct pci_dev *dev)
+static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
+                                                    struct pci_dev *dev)
 {
         struct pci_dynid *dynid;
 
@@ -559,7 +559,6 @@ static int __init pci_driver_init(void)
 postcore_initcall(pci_driver_init);
 
 EXPORT_SYMBOL(pci_match_id);
-EXPORT_SYMBOL(pci_match_device);
 EXPORT_SYMBOL(__pci_register_driver);
 EXPORT_SYMBOL(pci_unregister_driver);
 EXPORT_SYMBOL(pci_dev_driver);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index d0bb5b9d212..26cc4dcf4f0 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1621,12 +1621,8 @@ static void __init quirk_disable_all_msi(struct pci_dev *dev)
         printk(KERN_WARNING "PCI: MSI quirk detected. MSI deactivated.\n");
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RX790, quirk_disable_all_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS690, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);
 
 /* Disable MSI on chipsets that are known to not support it */
@@ -1678,6 +1674,9 @@ static void __devinit quirk_msi_ht_cap(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE,
                         quirk_msi_ht_cap);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS,
+                        PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB,
+                        quirk_msi_ht_cap);
 
 /* The nVidia CK804 chipset may have 2 HT MSI mappings.
  * MSI are supported if the MSI capability set in any of these mappings.
@@ -1705,4 +1704,48 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                         quirk_nvidia_ck804_msi_ht_cap);
+
+static void __devinit quirk_msi_intx_disable_bug(struct pci_dev *dev)
+{
+        dev->dev_flags |= PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG;
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_TIGON3_5780,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_TIGON3_5780S,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_TIGON3_5714,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_TIGON3_5714S,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_TIGON3_5715,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_TIGON3_5715S,
+                        quirk_msi_intx_disable_bug);
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4390,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4391,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4392,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4393,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4394,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4395,
+                        quirk_msi_intx_disable_bug);
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4373,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4374,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375,
+                        quirk_msi_intx_disable_bug);
+
 #endif /* CONFIG_PCI_MSI */
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index b001b5922e3..8541034021f 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -113,6 +113,8 @@ pci_find_next_bus(const struct pci_bus *from)
         return b;
 }
 
+#ifdef CONFIG_PCI_LEGACY
+
 /**
  * pci_find_slot - locate PCI device from a given PCI slot
  * @bus: number of PCI bus on which desired PCI device resides
@@ -137,6 +139,8 @@ pci_find_slot(unsigned int bus, unsigned int devfn)
         return NULL;
 }
 
+#endif /* CONFIG_PCI_LEGACY */
+
 /**
  * pci_get_slot - locate PCI device for a given PCI slot
  * @bus: PCI bus on which desired PCI device resides
@@ -200,6 +204,7 @@ struct pci_dev * pci_get_bus_and_slot(unsigned int bus, unsigned int devfn)
         return NULL;
 }
 
+#ifdef CONFIG_PCI_LEGACY
 /**
  * pci_find_subsys - begin or continue searching for a PCI device by vendor/subvendor/device/subdevice id
  * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids
@@ -278,6 +283,7 @@ pci_find_device(unsigned int vendor, unsigned int device, const struct pci_dev *
 {
         return pci_find_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);
 }
+#endif /* CONFIG_PCI_LEGACY */
 
 /**
  * pci_get_subsys - begin or continue searching for a PCI device by vendor/subvendor/device/subdevice id
@@ -468,8 +474,11 @@ int pci_dev_present(const struct pci_device_id *ids)
 EXPORT_SYMBOL(pci_dev_present);
 EXPORT_SYMBOL(pci_find_present);
 
+#ifdef CONFIG_PCI_LEGACY
 EXPORT_SYMBOL(pci_find_device);
 EXPORT_SYMBOL(pci_find_slot);
+#endif /* CONFIG_PCI_LEGACY */
+
 /* For boot time work */
 EXPORT_SYMBOL(pci_find_bus);
 EXPORT_SYMBOL(pci_find_next_bus);
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 86cf10efb0c..a6676be8784 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -725,7 +725,7 @@ config SCSI_FD_MCS
 
 config SCSI_GDTH
         tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"
-        depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
+        depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API && PCI_LEGACY
         ---help---
           Formerly called GDT SCSI Disk Array Controller Support.
 
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 0e357562ce9..ceb03c9e749 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1986,6 +1986,7 @@ static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
 
 static int pciserial_resume_one(struct pci_dev *dev)
 {
+        int err;
         struct serial_private *priv = pci_get_drvdata(dev);
 
         pci_set_power_state(dev, PCI_D0);
@@ -1995,7 +1996,9 @@ static int pciserial_resume_one(struct pci_dev *dev)
                 /*
                  * The device may have been disabled.  Re-enable it.
                  */
-                pci_enable_device(dev);
+                err = pci_enable_device(dev);
+                if (err)
+                        return err;
 
                 pciserial_resume_ports(priv);
         }