mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-05-16 21:33:13 +00:00
target/pscsi: fix return value check
In case of error, the function scsi_host_lookup() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Cc: <stable@vger.kernel.org> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
parent
48502ddbfb
commit
58932e96e4
1 changed files with 4 additions and 4 deletions
|
@ -134,10 +134,10 @@ static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag)
|
||||||
* pSCSI Host ID and enable for phba mode
|
* pSCSI Host ID and enable for phba mode
|
||||||
*/
|
*/
|
||||||
sh = scsi_host_lookup(phv->phv_host_id);
|
sh = scsi_host_lookup(phv->phv_host_id);
|
||||||
if (IS_ERR(sh)) {
|
if (!sh) {
|
||||||
pr_err("pSCSI: Unable to locate SCSI Host for"
|
pr_err("pSCSI: Unable to locate SCSI Host for"
|
||||||
" phv_host_id: %d\n", phv->phv_host_id);
|
" phv_host_id: %d\n", phv->phv_host_id);
|
||||||
return PTR_ERR(sh);
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
phv->phv_lld_host = sh;
|
phv->phv_lld_host = sh;
|
||||||
|
@ -515,10 +515,10 @@ static int pscsi_configure_device(struct se_device *dev)
|
||||||
sh = phv->phv_lld_host;
|
sh = phv->phv_lld_host;
|
||||||
} else {
|
} else {
|
||||||
sh = scsi_host_lookup(pdv->pdv_host_id);
|
sh = scsi_host_lookup(pdv->pdv_host_id);
|
||||||
if (IS_ERR(sh)) {
|
if (!sh) {
|
||||||
pr_err("pSCSI: Unable to locate"
|
pr_err("pSCSI: Unable to locate"
|
||||||
" pdv_host_id: %d\n", pdv->pdv_host_id);
|
" pdv_host_id: %d\n", pdv->pdv_host_id);
|
||||||
return PTR_ERR(sh);
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue