diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-19 11:10:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-19 11:10:19 +0800 |
| commit | 1fde384c30fb25ff0d7a3e7ed793019479b31e18 (patch) | |
| tree | 68b563bcab65d8c03dcb20d11622e5b8b904dcf8 /drivers/target/iscsi/iscsi_target_login.c | |
| parent | a44038112d3379f49df8a9db3e1259d9e945faee (diff) | |
| parent | c67d235857a13b609e664f901fb990f49796ddcc (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rt
Conflicts:
fs/dcache.c
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_login.c')
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_login.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index eb320e6eb93d..b06d3c0d2e66 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -1414,8 +1414,9 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) } login->zero_tsih = zero_tsih; - conn->sess->se_sess->sup_prot_ops = - conn->conn_transport->iscsit_get_sup_prot_ops(conn); + if (conn->sess) + conn->sess->se_sess->sup_prot_ops = + conn->conn_transport->iscsit_get_sup_prot_ops(conn); tpg = conn->tpg; if (!tpg) { |