Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers

[~andy/linux] / drivers / scsi / libiscsi_tcp.c

diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 5c92620292fba3b6e35076f366db1b338228c9a4..8eeb39ffa37fd82506673960b4906a88c60654f7 100644 (file)
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -421,7 +421,7 @@ iscsi_tcp_data_recv_prep(struct iscsi_tcp_conn *tcp_conn)
        struct iscsi_conn *conn = tcp_conn->iscsi_conn;
        struct hash_desc *rx_hash = NULL;
 
-       if (conn->datadgst_en &
+       if (conn->datadgst_en &&
            !(conn->session->tt->caps & CAP_DIGEST_OFFLOAD))
                rx_hash = tcp_conn->rx_hash;