]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.drivers/libata-sata_via-restore-vt-_prepare_host-error-handling
Move xen patchset to new version's subdir.
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / libata-sata_via-restore-vt-_prepare_host-error-handling
diff --git a/src/patches/suse-2.6.27.31/patches.drivers/libata-sata_via-restore-vt-_prepare_host-error-handling b/src/patches/suse-2.6.27.31/patches.drivers/libata-sata_via-restore-vt-_prepare_host-error-handling
new file mode 100644 (file)
index 0000000..f87440f
--- /dev/null
@@ -0,0 +1,42 @@
+From 554d491de112a378b4d1a705bb93b58bcd444a70 Mon Sep 17 00:00:00 2001
+From: Marcin Slusarz <marcin.slusarz@gmail.com>
+Date: Sun, 2 Nov 2008 22:18:52 +0100
+Subject: [PATCH] sata_via: restore vt*_prepare_host error handling
+References: bnc#441718
+
+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>
+Signed-off-by: Tejun Heo <teheo@suse.de>
+---
+ 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.4.5
+