From 8f4eecf92de15fbb91dc62473028739253991f25 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 6 Nov 2007 17:26:42 +1100 Subject: [PATCH] --- yaml --- r: 73324 b: refs/heads/master c: 7992344fdeb9b3bc0ce6eacaf600eb801f231c30 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/vio.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3591424f69a6..6c55a2d2b2cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aca71ef8827d11de243e30f170cfc126376803b4 +refs/heads/master: 7992344fdeb9b3bc0ce6eacaf600eb801f231c30 diff --git a/trunk/arch/powerpc/platforms/iseries/vio.c b/trunk/arch/powerpc/platforms/iseries/vio.c index d6435b03971f..be06cfd9fa3d 100644 --- a/trunk/arch/powerpc/platforms/iseries/vio.c +++ b/trunk/arch/powerpc/platforms/iseries/vio.c @@ -523,15 +523,16 @@ static void __init get_viotape_info(struct device_node *vio_root) static int __init iseries_vio_init(void) { struct device_node *vio_root; + int ret = -ENODEV; if (!firmware_has_feature(FW_FEATURE_ISERIES)) - return -ENODEV; + goto out; iommu_vio_init(); vio_root = of_find_node_by_path("/vdevice"); if (!vio_root) - return -ENODEV; + goto out; if (viopath_hostLp == HvLpIndexInvalid) { vio_set_hostlp(); @@ -544,10 +545,11 @@ static int __init iseries_vio_init(void) get_viocd_info(vio_root); get_viotape_info(vio_root); - return 0; + ret = 0; put_node: of_node_put(vio_root); - return -ENODEV; + out: + return ret; } arch_initcall(iseries_vio_init);