aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ibmvscsi/ibmvstgt.c3
-rw-r--r--drivers/scsi/ibmvscsi/rpa_vscsi.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 3fe831cdb74e..140dd9700ff6 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -899,7 +899,7 @@ static int get_system_info(void)
899 const char *id, *model, *name; 899 const char *id, *model, *name;
900 const unsigned int *num; 900 const unsigned int *num;
901 901
902 rootdn = find_path_device("/"); 902 rootdn = of_find_node_by_path("/");
903 if (!rootdn) 903 if (!rootdn)
904 return -ENOENT; 904 return -ENOENT;
905 905
@@ -916,6 +916,7 @@ static int get_system_info(void)
916 if (num) 916 if (num)
917 partition_number = *num; 917 partition_number = *num;
918 918
919 of_node_put(rootdn);
919 return 0; 920 return 0;
920} 921}
921 922
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index 9bbb69ca73ee..d8700aaa6114 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -157,7 +157,7 @@ static void gather_partition_info(void)
157 const unsigned int *p_number_ptr; 157 const unsigned int *p_number_ptr;
158 158
159 /* Retrieve information about this partition */ 159 /* Retrieve information about this partition */
160 rootdn = find_path_device("/"); 160 rootdn = of_find_node_by_path("/");
161 if (!rootdn) { 161 if (!rootdn) {
162 return; 162 return;
163 } 163 }
@@ -169,6 +169,7 @@ static void gather_partition_info(void)
169 p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL); 169 p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL);
170 if (p_number_ptr) 170 if (p_number_ptr)
171 partition_number = *p_number_ptr; 171 partition_number = *p_number_ptr;
172 of_node_put(rootdn);
172} 173}
173 174
174static void set_adapter_info(struct ibmvscsi_host_data *hostdata) 175static void set_adapter_info(struct ibmvscsi_host_data *hostdata)