Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

3 files changed, 39 insertions, 17 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 0c68d0f0d8e5..e23bc0d62159 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -389,14 +389,6 @@ config BLK_DEV_RZ1000
           Linux. This may slow disk throughput by a few percent, but at least
           things will operate 100% reliably.
 
-config BLK_DEV_SL82C105
-        tristate "Winbond SL82c105 support"
-        depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI
-        help
-          If you have a Winbond SL82c105 IDE controller, say Y here to enable
-          special configuration for this chip. This is common on various CHRP
-          motherboards, but could be used elsewhere. If in doubt, say Y.
-
 config BLK_DEV_IDEDMA_PCI
         bool "Generic PCI bus-master DMA support"
         depends on PCI && BLK_DEV_IDEPCI
@@ -712,6 +704,14 @@ config BLK_DEV_SIS5513
 
           Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>.
 
+config BLK_DEV_SL82C105
+        tristate "Winbond SL82c105 support"
+        depends on (PPC || ARM)
+        help
+          If you have a Winbond SL82c105 IDE controller, say Y here to enable
+          special configuration for this chip. This is common on various CHRP
+          motherboards, but could be used elsewhere. If in doubt, say Y.
+
 config BLK_DEV_SLC90E66
         tristate "SLC90E66 chipset support"
         help
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 287a66201150..16890769dca6 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -973,8 +973,8 @@ ide_settings_t *ide_find_setting_by_name (ide_drive_t *drive, char *name)
  *      @drive: drive
  *
  *      Automatically remove all the driver specific settings for this
- *      drive. This function may sleep and must not be called from IRQ
- *      context. The caller must hold ide_setting_sem.
+ *      drive. This function may not be called from IRQ context. The
+ *      caller must hold ide_setting_sem.
  */
  
 static void auto_remove_settings (ide_drive_t *drive)
@@ -1874,11 +1874,22 @@ void ide_unregister_subdriver(ide_drive_t *drive, ide_driver_t *driver)
 {
         unsigned long flags;
         
-        down(&ide_setting_sem);
-        spin_lock_irqsave(&ide_lock, flags);
 #ifdef CONFIG_PROC_FS
         ide_remove_proc_entries(drive->proc, driver->proc);
 #endif
+        down(&ide_setting_sem);
+        spin_lock_irqsave(&ide_lock, flags);
+        /*
+         * ide_setting_sem protects the settings list
+         * ide_lock protects the use of settings
+         *
+         * so we need to hold both, ide_settings_sem because we want to
+         * modify the settings list, and ide_lock because we cannot take
+         * a setting out that is being used.
+         *
+         * OTOH both ide_{read,write}_setting are only ever used under
+         * ide_setting_sem.
+         */
         auto_remove_settings(drive);
         spin_unlock_irqrestore(&ide_lock, flags);
         up(&ide_setting_sem);
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index eb7ab112c050..61f1a9665a7f 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -282,11 +282,11 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
          * Find the ISA bridge to see how good the IDE is.
          */
         via_config = via_config_find(&isa);
-        if (!via_config->id) {
-                printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
-                pci_dev_put(isa);
-                return -ENODEV;
-        }
+
+        /* We checked this earlier so if it fails here deeep badness
+           is involved */
+
+        BUG_ON(!via_config->id);
 
         /*
          * Setup or disable Clk66 if appropriate
@@ -494,6 +494,17 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
 
 static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
+        struct pci_dev *isa = NULL;
+        struct via_isa_bridge *via_config;
+        /*
+         * Find the ISA bridge and check we know what it is.
+         */
+        via_config = via_config_find(&isa);
+        pci_dev_put(isa);
+        if (!via_config->id) {
+                printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
+                return -ENODEV;
+        }
         return ide_setup_pci_device(dev, &via82cxxx_chipsets[id->driver_data]);
 }