2008-11-02 21:19:44

by Marcin Ślusarz

Subject: [PATCH] sata_via: restore vt*_prepare_host error handling

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 <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Joseph Chan <[email protected]>
Cc: Jeff Garzik <[email protected]>
---
drivers/ata/sata_via.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 62367fe..c18935f 100644
--- 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);

--
1.5.6.4

2008-11-03 02:48:10

by Tejun Heo

Subject: Re: [PATCH] sata_via: restore vt*_prepare_host error handling

Marcin Slusarz wrote:
> 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 <[email protected]>
> Cc: Tejun Heo <[email protected]>
> Cc: Joseph Chan <[email protected]>
> Cc: Jeff Garzik <[email protected]>

Acked-by: Tejun Heo <[email protected]>

Thank you.

--
tejun

2008-11-04 06:14:49

by Jeff Garzik

Subject: Re: [PATCH] sata_via: restore vt*_prepare_host error handling

Marcin Slusarz wrote:
> 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 <[email protected]>
> Cc: Tejun Heo <[email protected]>
> Cc: Joseph Chan <[email protected]>
> Cc: Jeff Garzik <[email protected]>
> ---
> drivers/ata/sata_via.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
> index 62367fe..c18935f 100644
> --- 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;

applied