[POWERPC] iSeries: Fix ref counting in vio setup
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
aca71ef882
commit
7992344fde
1 changed files with 6 additions and 4 deletions
|
@ -523,15 +523,16 @@ static void __init get_viotape_info(struct device_node *vio_root)
|
||||||
static int __init iseries_vio_init(void)
|
static int __init iseries_vio_init(void)
|
||||||
{
|
{
|
||||||
struct device_node *vio_root;
|
struct device_node *vio_root;
|
||||||
|
int ret = -ENODEV;
|
||||||
|
|
||||||
if (!firmware_has_feature(FW_FEATURE_ISERIES))
|
if (!firmware_has_feature(FW_FEATURE_ISERIES))
|
||||||
return -ENODEV;
|
goto out;
|
||||||
|
|
||||||
iommu_vio_init();
|
iommu_vio_init();
|
||||||
|
|
||||||
vio_root = of_find_node_by_path("/vdevice");
|
vio_root = of_find_node_by_path("/vdevice");
|
||||||
if (!vio_root)
|
if (!vio_root)
|
||||||
return -ENODEV;
|
goto out;
|
||||||
|
|
||||||
if (viopath_hostLp == HvLpIndexInvalid) {
|
if (viopath_hostLp == HvLpIndexInvalid) {
|
||||||
vio_set_hostlp();
|
vio_set_hostlp();
|
||||||
|
@ -544,10 +545,11 @@ static int __init iseries_vio_init(void)
|
||||||
get_viocd_info(vio_root);
|
get_viocd_info(vio_root);
|
||||||
get_viotape_info(vio_root);
|
get_viotape_info(vio_root);
|
||||||
|
|
||||||
return 0;
|
ret = 0;
|
||||||
|
|
||||||
put_node:
|
put_node:
|
||||||
of_node_put(vio_root);
|
of_node_put(vio_root);
|
||||||
return -ENODEV;
|
out:
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
arch_initcall(iseries_vio_init);
|
arch_initcall(iseries_vio_init);
|
||||||
|
|
Loading…
Reference in a new issue