Commit 23a1b2a7 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] via82cxxx: handle error condition properly 



Jeff noted that the via driver returned an error to an unsigned int in a
a case where errors are not permitted. Move the check down earlier so we
can handle it properly. Not as pretty but it works this way and avoids
hacking up ugly stuff in the legacy ide core.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87b4126f

drivers/ide/pci/via82cxxx.c

+16 −5
Original line number Diff line number Diff line
@@ -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]);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE