Index: sys/cam/ata/ata_da.c
===================================================================
--- sys/cam/ata/ata_da.c	(revision 302264)
+++ sys/cam/ata/ata_da.c	(working copy)
@@ -436,8 +436,8 @@
 		 * Crucial M500 SSDs MU07 firmware
 		 * NCQ Trim works
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT*M500*", "MU07" },
-		/*quirks*/0
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT???M500*",
+		"MU07" }, /*quirks*/0
 	},
 	{
 		/*
@@ -444,7 +444,7 @@
 		 * Crucial M500 SSDs all other firmware
 		 * NCQ Trim doesn't work
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT*M500*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT???M500*", "*" },
 		/*quirks*/ADA_Q_NCQ_TRIM_BROKEN
 	},
 	{
@@ -452,16 +452,24 @@
 		 * Crucial M550 SSDs
 		 * NCQ Trim doesn't work, but only on MU01 firmware
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT*M550*", "MU01" },
-		/*quirks*/ADA_Q_NCQ_TRIM_BROKEN
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT???M550*",
+		"MU01" }, /*quirks*/ADA_Q_NCQ_TRIM_BROKEN
 	},
 	{
 		/*
+		 * Crucial M550 SSDs (1TB)
+		 * NCQ Trim doesn't work, but only on MU01 firmware
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT????M550*",
+		"MU01" }, /*quirks*/ADA_Q_NCQ_TRIM_BROKEN
+	},
+	{
+		/*
 		 * Crucial MX100 SSDs
 		 * NCQ Trim doesn't work, but only on MU01 firmware
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT*MX100*", "MU01" },
-		/*quirks*/ADA_Q_NCQ_TRIM_BROKEN
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Crucial CT???MX100*",
+		"MU01" }, /*quirks*/ADA_Q_NCQ_TRIM_BROKEN
 	},
 	{
 		/*
@@ -476,7 +484,7 @@
 		 * FCCT M500 SSDs
 		 * NCQ Trim doesn't work
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "FCCT*M500*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "FCCT???M500*", "*" },
 		/*quirks*/ADA_Q_NCQ_TRIM_BROKEN
 	},
 	{
@@ -561,14 +569,22 @@
 	},
 	{
 		/*
-		 * Micron M5[15]0 SSDs
+		 * Micron M510 SSDs
 		 * NCQ Trim doesn't work, but only MU01 firmware
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Micron M5[15]0*", "MU01" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Micron M510*", "MU01" },
 		/*quirks*/ADA_Q_NCQ_TRIM_BROKEN
 	},
 	{
 		/*
+		 * Micron M550 SSDs
+		 * NCQ Trim doesn't work, but only MU01 firmware
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Micron M550*", "MU01" },
+		/*quirks*/ADA_Q_NCQ_TRIM_BROKEN
+	},
+	{
+		/*
 		 * OCZ Agility 2 SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */