]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From 554d491de112a378b4d1a705bb93b58bcd444a70 Mon Sep 17 00:00:00 2001 |
2 | From: Marcin Slusarz <marcin.slusarz@gmail.com> | |
3 | Date: Sun, 2 Nov 2008 22:18:52 +0100 | |
4 | Subject: [PATCH] sata_via: restore vt*_prepare_host error handling | |
5 | References: bnc#441718 | |
6 | ||
7 | commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 (sata_via: fix support | |
8 | for 5287) accidently (?) removed vt*_prepare_host error handling - restore it | |
9 | ||
10 | catched by gcc: | |
11 | drivers/ata/sata_via.c: In function 'svia_init_one': | |
12 | drivers/ata/sata_via.c:567: warning: 'host' may be used uninitialized in this function | |
13 | ||
14 | Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> | |
15 | Cc: Tejun Heo <tj@kernel.org> | |
16 | Cc: Joseph Chan <JosephChan@via.com.tw> | |
17 | Cc: Jeff Garzik <jgarzik@redhat.com> | |
18 | Signed-off-by: Jeff Garzik <jgarzik@redhat.com> | |
19 | Signed-off-by: Tejun Heo <teheo@suse.de> | |
20 | --- | |
21 | drivers/ata/sata_via.c | 4 +++- | |
22 | 1 files changed, 3 insertions(+), 1 deletions(-) | |
23 | ||
24 | diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c | |
25 | index 62367fe..c18935f 100644 | |
26 | --- a/drivers/ata/sata_via.c | |
27 | +++ b/drivers/ata/sata_via.c | |
28 | @@ -602,8 +602,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |
29 | rc = vt8251_prepare_host(pdev, &host); | |
30 | break; | |
31 | default: | |
32 | - return -EINVAL; | |
33 | + rc = -EINVAL; | |
34 | } | |
35 | + if (rc) | |
36 | + return rc; | |
37 | ||
38 | svia_configure(pdev); | |
39 | ||
40 | -- | |
41 | 1.5.4.5 | |
42 |