Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35198234 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

pdc202xx_new: fix PCI refcounting 



The driver erroneously "lets go" the mate IDE chip in init_setup_pdc20270()
when ide_setup_pci_devices() call succeeds -- fix this, and drop a couple of
useless assignments in this function while at it...

Bart: keep "findev" variable initialization to silence gcc

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 0505b55f

drivers/ide/pci/pdc202xx_new.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
 *  Split from:

 *  Split from:

 *  linux/drivers/ide/pdc202xx.c	Version 0.35	Mar. 30, 2002

 *  linux/drivers/ide/pdc202xx.c	Version 0.35	Mar. 30, 2002

 *  Copyright (C) 1998-2002		Andre Hedrick <andre@linux-ide.org>

 *  Copyright (C) 1998-2002		Andre Hedrick <andre@linux-ide.org>

 *  Copyright (C) 2005-2006		MontaVista Software, Inc.

 *  Copyright (C) 2005-2007		MontaVista Software, Inc.

 *  Portions Copyright (C) 1999 Promise Technology, Inc.

 *  Portions Copyright (C) 1999 Promise Technology, Inc.

 *  Author: Frank Tiernan (frankt@promise.com)

 *  Author: Frank Tiernan (frankt@promise.com)

 *  Released under terms of General Public License

 *  Released under terms of General Public License
@@ -535,7 +535,7 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev, 
	    (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) {

	    (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) {

		if (PCI_SLOT(dev->devfn) & 2)

		if (PCI_SLOT(dev->devfn) & 2)

			return -ENODEV;

			return -ENODEV;

		d->extra = 0;



		while ((findev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) {

		while ((findev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) {

			if ((findev->vendor == dev->vendor) &&

			if ((findev->vendor == dev->vendor) &&

			    (findev->device == dev->device) &&

			    (findev->device == dev->device) &&
@@ -544,6 +544,7 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev, 
					findev->irq = dev->irq;

					findev->irq = dev->irq;

				}

				}

				ret = ide_setup_pci_devices(dev, findev, d);

				ret = ide_setup_pci_devices(dev, findev, d);

				if (ret < 0)

					pci_dev_put(findev);

					pci_dev_put(findev);

				return ret;

				return ret;

			}

			}