diff --git a/[refs] b/[refs]
index b27ac3680254..a537f0ebd8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7cfec4130fdbe4b74277c91b6ba91f56eaca03
+refs/heads/master: 61356eea6742ad38ad9ecfd5c65e2662e4c9d8ab
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/cypress_firmware.c b/trunk/drivers/media/usb/dvb-usb-v2/cypress_firmware.c
index 211df549f26a..cfb1733519c2 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/cypress_firmware.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/cypress_firmware.c
@@ -71,9 +71,8 @@ int usbv2_cypress_load_firmware(struct usb_device *udev,
 		if (ret < 0) {
 			goto err_kfree;
 		} else if (ret != hx->len) {
-			dev_err(&udev->dev, "%s: error while transferring " \
-					"firmware (transferred size=%d, " \
-					"block size=%d)\n",
+			dev_err(&udev->dev,
+					"%s: error while transferring firmware (transferred size=%d, block size=%d)\n",
 					KBUILD_MODNAME, ret, hx->len);
 			ret = -EIO;
 			goto err_kfree;