Skip to content

Commit

Permalink
[POWERPC] iSeries: Fix ref counting in vio setup
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Nov 8, 2007
1 parent aca71ef commit 7992344
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions arch/powerpc/platforms/iseries/vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);

0 comments on commit 7992344

Please sign in to comment.