Merge patch series "scsi: replace deprecated strncpy"

[linux-2.6-block.git] / drivers / scsi / mpt3sas / mpt3sas_base.c

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 1b492e9a3e55ea2650fa4185ea3fa55187816b5d..105917ea70ffa6b38526d8b6771d22603419e75d 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -4774,7 +4774,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc)
        char desc[17] = {0};
        u32 iounit_pg1_flags;
 
-       strncpy(desc, ioc->manu_pg0.ChipName, 16);
+       strscpy(desc, ioc->manu_pg0.ChipName, sizeof(desc));
        ioc_info(ioc, "%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x)\n",
                 desc,
                 (ioc->facts.FWVersion.Word & 0xFF000000) >> 24,