Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / sata_via.c

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 62367fe4d5dc2f6e9cf6d77c327f64eb8407ce12..c18935f0bda215d5987c4324fa8374a4f3efa1e1 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -602,8 +602,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                rc = vt8251_prepare_host(pdev, &host);
                break;
        default:
-               return -EINVAL;
+               rc = -EINVAL;
        }
+       if (rc)
+               return rc;
 
        svia_configure(pdev);