diff --git a/[refs] b/[refs]
index afff46b6d217..88002db02088 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9318dce5038f193f46091b80c61928395a4139b7
+refs/heads/master: d3873a1be9f2d497e9ff013e4a83a2a4d9f1d22d
diff --git a/trunk/sound/usb/caiaq/device.c b/trunk/sound/usb/caiaq/device.c
index 9be0f2ef0413..d06d7fcbb8e8 100644
--- a/trunk/sound/usb/caiaq/device.c
+++ b/trunk/sound/usb/caiaq/device.c
@@ -432,8 +432,8 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
 	if (c)
 		*c = '\0';
 
-	strcpy(card->driver, MODNAME);
-	strcpy(card->shortname, dev->product_name);
+	strlcpy(card->driver, MODNAME, sizeof(card->driver));
+	strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
 
 	len = snprintf(card->longname, sizeof(card->longname),
 		       "%s %s (serial %s, ",