sata_via: restore vt*_prepare_host error handling
authorMarcin Slusarz <marcin.slusarz@gmail.com>
Sun, 2 Nov 2008 21:18:52 +0000 (22:18 +0100)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 4 Nov 2008 06:08:06 +0000 (01:08 -0500)
commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 (sata_via: fix support
for 5287) accidently (?) removed vt*_prepare_host error handling - restore it

catched by gcc:
drivers/ata/sata_via.c: In function 'svia_init_one':
drivers/ata/sata_via.c:567: warning: 'host' may be used uninitialized in this function

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/sata_via.c

index 62367fe4d5dc2f6e9cf6d77c327f64eb8407ce12..c18935f0bda215d5987c4324fa8374a4f3efa1e1 100644 (file)
@@ -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);