13 files changed, 67 insertions, 35 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ef1ed5d70125..2e3a0d4bc4c2 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -137,7 +137,7 @@ config CYCLADES
           your Linux box, for instance in order to become a dial-in server.
 
           For information about the Cyclades-Z card, read
-          <file:drivers/char/README.cycladesZ>.
+          <file:Documentation/README.cycladesZ>.
 
           To compile this driver as a module, choose M here: the
           module will be called cyclades.
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index d87961993ccf..03eac1eb8e0f 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -10,6 +10,8 @@
 #include <linux/agp_backend.h>
 #include "agp.h"
 
+#define PCI_DEVICE_ID_INTEL_E7221_HB    0x2588
+#define PCI_DEVICE_ID_INTEL_E7221_IG    0x258a
 #define PCI_DEVICE_ID_INTEL_82946GZ_HB      0x2970
 #define PCI_DEVICE_ID_INTEL_82946GZ_IG      0x2972
 #define PCI_DEVICE_ID_INTEL_82965G_1_HB     0x2980
@@ -526,7 +528,8 @@ static void intel_i830_init_gtt_entries(void)
                         break;
                 case I915_GMCH_GMS_STOLEN_48M:
                         /* Check it's really I915G */
-                        if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
+                        if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB ||
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB ||
@@ -538,7 +541,8 @@ static void intel_i830_init_gtt_entries(void)
                         break;
                 case I915_GMCH_GMS_STOLEN_64M:
                         /* Check it's really I915G */
-                        if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
+                        if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB ||
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB ||
@@ -1854,6 +1858,8 @@ static const struct intel_driver_description {
         { PCI_DEVICE_ID_INTEL_82865_HB, PCI_DEVICE_ID_INTEL_82865_IG, 0, "865",
                 &intel_845_driver, &intel_830_driver },
         { PCI_DEVICE_ID_INTEL_82875_HB, 0, 0, "i875", &intel_845_driver, NULL },
+        { PCI_DEVICE_ID_INTEL_E7221_HB, PCI_DEVICE_ID_INTEL_E7221_IG, 0, "E7221 (i915)",
+                NULL, &intel_915_driver },
         { PCI_DEVICE_ID_INTEL_82915G_HB, PCI_DEVICE_ID_INTEL_82915G_IG, 0, "915G",
                 NULL, &intel_915_driver },
         { PCI_DEVICE_ID_INTEL_82915GM_HB, PCI_DEVICE_ID_INTEL_82915GM_IG, 0, "915GM",
@@ -2059,6 +2065,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_82875_HB),
         ID(PCI_DEVICE_ID_INTEL_7505_0),
         ID(PCI_DEVICE_ID_INTEL_7205_0),
+        ID(PCI_DEVICE_ID_INTEL_E7221_HB),
         ID(PCI_DEVICE_ID_INTEL_82915G_HB),
         ID(PCI_DEVICE_ID_INTEL_82915GM_HB),
         ID(PCI_DEVICE_ID_INTEL_82945G_HB),
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index f3593974496c..43d3c42df360 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -297,6 +297,7 @@
         {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x258a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x27a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 6a182e14cf58..ad6c8a319903 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -2,6 +2,14 @@
     it87.c - Part of lm_sensors, Linux kernel modules for hardware
              monitoring.
 
+    The IT8705F is an LPC-based Super I/O part that contains UARTs, a
+    parallel port, an IR port, a MIDI port, a floppy controller, etc., in
+    addition to an Environment Controller (Enhanced Hardware Monitor and
+    Fan Controller)
+
+    This driver supports only the Environment Controller in the IT8705F and
+    similar parts.  The other devices are supported by different drivers.
+
     Supports: IT8705F  Super I/O chip w/LPC interface
               IT8712F  Super I/O chip w/LPC interface
               IT8716F  Super I/O chip w/LPC interface
@@ -118,9 +126,15 @@ static int fix_pwm_polarity;
 /* Length of ISA address segment */
 #define IT87_EXTENT 8
 
-/* Where are the ISA address/data registers relative to the base address */
-#define IT87_ADDR_REG_OFFSET 5
-#define IT87_DATA_REG_OFFSET 6
+/* Length of ISA address segment for Environmental Controller */
+#define IT87_EC_EXTENT 2
+
+/* Offset of EC registers from ISA base address */
+#define IT87_EC_OFFSET 5
+
+/* Where are the ISA address/data registers relative to the EC base address */
+#define IT87_ADDR_REG_OFFSET 0
+#define IT87_DATA_REG_OFFSET 1
 
 /*----- The IT87 registers -----*/
 
@@ -968,10 +982,10 @@ static int __devinit it87_probe(struct platform_device *pdev)
         };
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!request_region(res->start, IT87_EXTENT, DRVNAME)) {
+        if (!request_region(res->start, IT87_EC_EXTENT, DRVNAME)) {
                 dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
                         (unsigned long)res->start,
-                        (unsigned long)(res->start + IT87_EXTENT - 1));
+                        (unsigned long)(res->start + IT87_EC_EXTENT - 1));
                 err = -EBUSY;
                 goto ERROR0;
         }
@@ -1124,7 +1138,7 @@ ERROR2:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 ERROR1:
-        release_region(res->start, IT87_EXTENT);
+        release_region(res->start, IT87_EC_EXTENT);
 ERROR0:
         return err;
 }
@@ -1137,7 +1151,7 @@ static int __devexit it87_remove(struct platform_device *pdev)
         sysfs_remove_group(&pdev->dev.kobj, &it87_group);
         sysfs_remove_group(&pdev->dev.kobj, &it87_group_opt);
 
-        release_region(data->addr, IT87_EXTENT);
+        release_region(data->addr, IT87_EC_EXTENT);
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 
@@ -1402,8 +1416,8 @@ static int __init it87_device_add(unsigned short address,
                                   const struct it87_sio_data *sio_data)
 {
         struct resource res = {
-                .start  = address ,
-                .end    = address + IT87_EXTENT - 1,
+                .start  = address + IT87_EC_OFFSET,
+                .end    = address + IT87_EC_OFFSET + IT87_EC_EXTENT - 1,
                 .name   = DRVNAME,
                 .flags  = IORESOURCE_IO,
         };
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9ae3166e3162..9af05a2f4af3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2465,9 +2465,6 @@ config IXGBE
 
           <http://support.intel.com>
 
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/ixgbe.txt>.
-
           To compile this driver as a module, choose M here. The module
           will be called ixgbe.
 
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 7eab072ae792..b570402f7fed 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -372,7 +372,7 @@ static void __mdio_cmd(void __iomem *ioaddr, u32 ctl)
                 msleep(1);
         }
 
-        if (i > 999)
+        if (i > 99)
                 printk(KERN_ERR PFX "PHY command failed !\n");
 }
 
@@ -847,10 +847,8 @@ static void sis190_soft_reset(void __iomem *ioaddr)
 {
         SIS_W32(IntrControl, 0x8000);
         SIS_PCI_COMMIT();
-        msleep(1);
         SIS_W32(IntrControl, 0x0);
         sis190_asic_down(ioaddr);
-        msleep(1);
 }
 
 static void sis190_hw_start(struct net_device *dev)
@@ -1041,8 +1039,6 @@ static int sis190_open(struct net_device *dev)
         if (rc < 0)
                 goto err_free_rx_1;
 
-        INIT_WORK(&tp->phy_task, sis190_phy_task);
-
         sis190_request_timer(dev);
 
         rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);
@@ -1549,28 +1545,31 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
 }
 
 /**
- *      sis190_get_mac_addr_from_apc - Get MAC address for SiS965 model
+ *      sis190_get_mac_addr_from_apc - Get MAC address for SiS96x model
  *      @pdev: PCI device
  *      @dev:  network device to get address for
  *
- *      SiS965 model, use APC CMOS RAM to store MAC address.
+ *      SiS96x model, use APC CMOS RAM to store MAC address.
  *      APC CMOS RAM is accessed through ISA bridge.
  *      MAC address is read into @net_dev->dev_addr.
  */
 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
                                                   struct net_device *dev)
 {
+        static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
         struct sis190_private *tp = netdev_priv(dev);
         struct pci_dev *isa_bridge;
         u8 reg, tmp8;
-        int i;
+        unsigned int i;
 
         net_probe(tp, KERN_INFO "%s: Read MAC address from APC.\n",
                   pci_name(pdev));
 
-        isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0965, NULL);
-        if (!isa_bridge)
-                isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0966, NULL);
+        for (i = 0; i < ARRAY_SIZE(ids); i++) {
+                isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, ids[i], NULL);
+                if (isa_bridge)
+                        break;
+        }
 
         if (!isa_bridge) {
                 net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index b4891caeae5a..656200472fa1 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1909,7 +1909,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
         if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {
                 /* SROM V4.01 */
                 /* Get NIC support media mode */
-                db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2);
+                db->NIC_capability = le16_to_cpup((__le16 *) (srom + 34));
                 db->PHY_reg4 = 0;
                 for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {
                         switch( db->NIC_capability & tmp_reg ) {
@@ -1921,8 +1921,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
                 }
 
                 /* Media Mode Force or not check */
-                dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) &
-                                le32_to_cpup((__le32 *)srom + 36/4);
+                dmfe_mode = (le32_to_cpup((__le32 *) (srom + 34)) &
+                             le32_to_cpup((__le32 *) (srom + 36)));
                 switch(dmfe_mode) {
                 case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */
                 case 0x2: dmfe_media_mode = DMFE_10MFD; break;  /* 10MFD */
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c98fc62a3e61..2c08c0a5a0df 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -68,7 +68,7 @@ config WAVELAN
           <http://www.tldp.org/docs.html#howto>. Some more specific
           information is contained in
           <file:Documentation/networking/wavelan.txt> and in the source code
-          <file:drivers/net/wavelan.p.h>.
+          <file:drivers/net/wireless/wavelan.p.h>.
 
           You will also need the wireless tools package available from
           <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 1a6b0e0edf6f..0b3ec7e4d93b 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6342,6 +6342,11 @@ static int __iwl_up(struct iwl_priv *priv)
                 return 0;
         }
 
+        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+                IWL_ERROR("ucode not available for device bringup\n");
+                return -EIO;
+        }
+
         iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
 
         rc = iwl_hw_nic_init(priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 6cd57c220631..15a45f471710 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -6698,6 +6698,11 @@ static int __iwl_up(struct iwl_priv *priv)
                 return 0;
         }
 
+        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+                IWL_ERROR("ucode not available for device bringup\n");
+                return -EIO;
+        }
+
         iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
 
         rc = iwl_hw_nic_init(priv);
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a6676be87843..184c7ae78519 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -732,7 +732,7 @@ config SCSI_GDTH
           This is a driver for RAID/SCSI Disk Array Controllers (EISA/ISA/PCI) 
           manufactured by Intel Corporation/ICP vortex GmbH. It is documented
           in the kernel source in <file:drivers/scsi/gdth.c> and
-          <file:drivers/scsi/gdth.h.>
+          <file:drivers/scsi/gdth.h>.
 
           To compile this driver as a module, choose M here: the
           module will be called gdth.
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 01bf0189367d..a10a5c74b48d 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -823,7 +823,7 @@ static void initio_append_busy_scb(struct initio_host * host, struct scsi_ctrl_b
 {
 
 #if DEBUG_QUEUE
-        printk("append busy SCB %o; ", scbp);
+        printk("append busy SCB %p; ", scbp);
 #endif
         if (scbp->tagmsg)
                 host->act_tags[scbp->target]++;
@@ -2609,6 +2609,7 @@ static void initio_build_scb(struct initio_host * host, struct scsi_ctrl_blk * c
                 cblk->bufptr = cpu_to_le32((u32)dma_addr);
                 cmnd->SCp.dma_handle = dma_addr;
 
+                cblk->sglen = nseg;
 
                 cblk->flags |= SCF_SG;  /* Turn on SG list flag       */
                 total_len = 0;
@@ -2869,6 +2870,7 @@ static int initio_probe_one(struct pci_dev *pdev,
         host = (struct initio_host *)shost->hostdata;
         memset(host, 0, sizeof(struct initio_host));
         host->addr = pci_resource_start(pdev, 0);
+        host->bios_addr = bios_seg;
 
         if (!request_region(host->addr, 256, "i91u")) {
                 printk(KERN_WARNING "initio: I/O port range 0x%x is busy.\n", host->addr);
@@ -2895,6 +2897,8 @@ static int initio_probe_one(struct pci_dev *pdev,
 
         host->pci_dev = pdev;
 
+        host->semaph = 1;
+        spin_lock_init(&host->semaph_lock);
         host->num_scbs = num_scb;
         host->scb = scb;
         host->next_pending = scb;
@@ -2911,7 +2915,7 @@ static int initio_probe_one(struct pci_dev *pdev,
         host->last_avail = prev;
         spin_lock_init(&host->avail_lock);
 
-        initio_init(host, phys_to_virt(bios_seg << 4));
+        initio_init(host, phys_to_virt(((u32)bios_seg << 4)));
 
         host->jsstatus0 = 0;
 
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 4318935678c5..112f4ec59035 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -112,7 +112,7 @@ static struct w1_therm_family_converter w1_therm_families[] = {
 
 static inline int w1_DS18B20_convert_temp(u8 rom[9])
 {
-        int t = (rom[1] << 8) | rom[0];
+        s16 t = (rom[1] << 8) | rom[0];
         t /= 16;
         return t;
 }
@@ -204,7 +204,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,
 
                                 crc = w1_calc_crc8(rom, 8);
 
-                                if (rom[8] == crc && rom[0])
+                                if (rom[8] == crc)
                                         verdict = 1;
                         }
                 }