diff --git a/[refs] b/[refs]
index 442b0877dbd3..29a64439b024 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4be1ad36683b23355f059c3386f97a4427d1a56a
+refs/heads/master: 2c6beca875f0237ae9cfb2bb26144b60b9418c3a
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-video.c b/trunk/drivers/media/video/cx231xx/cx231xx-video.c
index 254d2281bfcd..d660c08634a2 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1640,8 +1640,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 
 	strlcpy(cap->driver, "cx231xx", sizeof(cap->driver));
 	strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));
-	strlcpy(cap->bus_info, dev->v4l2_dev.name,
-		sizeof(cap->bus_info));
+	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
 
 	cap->version = CX231XX_VERSION_CODE;