Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / drivers / scsi / esas2r / esas2r_vda.c

diff --git a/drivers/scsi/esas2r/esas2r_vda.c b/drivers/scsi/esas2r/esas2r_vda.c
index fd1392879647c63f6d2709db2d2033981ea87b5d..30028e56df63790e7f8ae1a9b6caec3a729fc966 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_vda.c
+++ b/drivers/scsi/esas2r/esas2r_vda.c
@@ -84,7 +84,7 @@ bool esas2r_process_vda_ioctl(struct esas2r_adapter *a,
                return false;
        }
 
-       if (a->flags & AF_DEGRADED_MODE) {
+       if (test_bit(AF_DEGRADED_MODE, &a->flags)) {
                vi->status = ATTO_STS_DEGRADED;
                return false;
        }
@@ -310,9 +310,9 @@ static void esas2r_complete_vda_ioctl(struct esas2r_adapter *a,
                                le32_to_cpu(rsp->vda_version);
                        cfg->data.init.fw_build = rsp->fw_build;
 
-                       snprintf(buf, sizeof(buf), "%1d.%02d",
-                               (int)LOBYTE(le16_to_cpu(rsp->fw_release)),
-                               (int)HIBYTE(le16_to_cpu(rsp->fw_release)));
+                       snprintf(buf, sizeof(buf), "%1.1u.%2.2u",
+                                (int)LOBYTE(le16_to_cpu(rsp->fw_release)),
+                                (int)HIBYTE(le16_to_cpu(rsp->fw_release)));
 
                        memcpy(&cfg->data.init.fw_release, buf,
                               sizeof(cfg->data.init.fw_release));
@@ -389,7 +389,7 @@ void esas2r_build_mgt_req(struct esas2r_adapter *a,
        vrq->length = cpu_to_le32(length);
 
        if (vrq->length) {
-               if (a->flags & AF_LEGACY_SGE_MODE) {
+               if (test_bit(AF_LEGACY_SGE_MODE, &a->flags)) {
                        vrq->sg_list_offset = (u8)offsetof(
                                struct atto_vda_mgmt_req, sge);
 
@@ -427,7 +427,7 @@ void esas2r_build_ae_req(struct esas2r_adapter *a, struct esas2r_request *rq)
 
        vrq->length = cpu_to_le32(sizeof(struct atto_vda_ae_data));
 
-       if (a->flags & AF_LEGACY_SGE_MODE) {
+       if (test_bit(AF_LEGACY_SGE_MODE, &a->flags)) {
                vrq->sg_list_offset =
                        (u8)offsetof(struct atto_vda_ae_req, sge);
                vrq->sge[0].length = cpu_to_le32(SGE_LAST | vrq->length);