Commit ed4c5fa4 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: uvcvideo: use dev_printk() for uvc_trace() 



Instead of calling prink() inside uvc_trace, use dev_printk(), which adds
context to the output.

Now that we are at it, regroup the strings so the messages can be easily
"grepable".

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 59e92bf6

drivers/media/usb/uvc/uvc_ctrl.c

+35 −31
Original line number Diff line number Diff line
@@ -906,8 +906,8 @@ static struct uvc_control *uvc_find_control(struct uvc_video_chain *chain, 
	}



	if (ctrl == NULL && !next)

		uvc_trace(UVC_TRACE_CONTROL, "Control 0x%08x not found.\n",

				v4l2_id);

		uvc_trace(chain->dev, UVC_TRACE_CONTROL,

			  "Control 0x%08x not found.\n", v4l2_id);



	return ctrl;

}
@@ -1800,7 +1800,7 @@ static int uvc_ctrl_fill_xu_info(struct uvc_device *dev, 
	ret = uvc_query_ctrl(dev, UVC_GET_LEN, ctrl->entity->id, dev->intfnum,

			     info->selector, data, 2);

	if (ret < 0) {

		uvc_trace(UVC_TRACE_CONTROL,

		uvc_trace(dev, UVC_TRACE_CONTROL,

			  "GET_LEN failed on control %pUl/%u (%d).\n",

			  info->entity, info->selector, ret);

		goto done;
@@ -1813,7 +1813,7 @@ static int uvc_ctrl_fill_xu_info(struct uvc_device *dev, 


	ret = uvc_ctrl_get_flags(dev, ctrl, info);

	if (ret < 0) {

		uvc_trace(UVC_TRACE_CONTROL,

		uvc_trace(dev, UVC_TRACE_CONTROL,

			  "Failed to get flags for control %pUl/%u (%d).\n",

			  info->entity, info->selector, ret);

		goto done;
@@ -1821,8 +1821,8 @@ static int uvc_ctrl_fill_xu_info(struct uvc_device *dev, 


	uvc_ctrl_fixup_xu_info(dev, ctrl, info);



	uvc_trace(UVC_TRACE_CONTROL, "XU control %pUl/%u queried: len %u, "

		  "flags { get %u set %u auto %u }.\n",

	uvc_trace(dev, UVC_TRACE_CONTROL,

		  "XU control %pUl/%u queried: len %u, flags { get %u set %u auto %u }.\n",

		  info->entity, info->selector, info->size,

		  (info->flags & UVC_CTRL_FLAG_GET_CUR) ? 1 : 0,

		  (info->flags & UVC_CTRL_FLAG_SET_CUR) ? 1 : 0,
@@ -1851,9 +1851,10 @@ static int uvc_ctrl_init_xu_ctrl(struct uvc_device *dev, 


	ret = uvc_ctrl_add_info(dev, ctrl, &info);

	if (ret < 0)

		uvc_trace(UVC_TRACE_CONTROL, "Failed to initialize control "

			  "%pUl/%u on device %s entity %u\n", info.entity,

			  info.selector, dev->udev->devpath, ctrl->entity->id);

		uvc_trace(dev, UVC_TRACE_CONTROL,

			  "Failed to initialize control %pUl/%u on device %s entity %u\n",

			  info.entity, info.selector, dev->udev->devpath,

			  ctrl->entity->id);



	return ret;

}
@@ -1881,8 +1882,8 @@ int uvc_xu_ctrl_query(struct uvc_video_chain *chain, 
	}



	if (!found) {

		uvc_trace(UVC_TRACE_CONTROL, "Extension unit %u not found.\n",

			xqry->unit);

		uvc_trace(chain->dev, UVC_TRACE_CONTROL,

			  "Extension unit %u not found.\n", xqry->unit);

		return -ENOENT;

	}
@@ -1897,8 +1898,9 @@ int uvc_xu_ctrl_query(struct uvc_video_chain *chain, 
	}



	if (!found) {

		uvc_trace(UVC_TRACE_CONTROL, "Control %pUl/%u not found.\n",

			entity->guid, xqry->selector);

		uvc_trace(chain->dev, UVC_TRACE_CONTROL,

			  "Control %pUl/%u not found.\n", entity->guid,

			  xqry->selector);

		return -ENOENT;

	}
@@ -2046,9 +2048,10 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, struct uvc_control *ctrl, 


	ctrl->initialized = 1;



	uvc_trace(UVC_TRACE_CONTROL, "Added control %pUl/%u to device %s "

		"entity %u\n", ctrl->info.entity, ctrl->info.selector,

		dev->udev->devpath, ctrl->entity->id);

	uvc_trace(dev, UVC_TRACE_CONTROL,

		  "Added control %pUl/%u to device %s entity %u\n",

		  ctrl->info.entity, ctrl->info.selector, dev->udev->devpath,

		  ctrl->entity->id);



	return 0;

}
@@ -2085,7 +2088,7 @@ static int __uvc_ctrl_add_mapping(struct uvc_device *dev, 
		map->set = uvc_set_le_value;



	list_add_tail(&map->list, &ctrl->info.mappings);

	uvc_trace(UVC_TRACE_CONTROL,

	uvc_trace(dev, UVC_TRACE_CONTROL,

		  "Adding mapping '%s' to control %pUl/%u.\n",

		  map->name, ctrl->info.entity, ctrl->info.selector);
@@ -2103,9 +2106,9 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 
	int ret;



	if (mapping->id & ~V4L2_CTRL_ID_MASK) {

		uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', control "

			"id 0x%08x is invalid.\n", mapping->name,

			mapping->id);

		uvc_trace(dev, UVC_TRACE_CONTROL,

			  "Can't add mapping '%s', control id 0x%08x is invalid.\n",

			  mapping->name, mapping->id);

		return -EINVAL;

	}
@@ -2150,8 +2153,8 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 


	list_for_each_entry(map, &ctrl->info.mappings, list) {

		if (mapping->id == map->id) {

			uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', "

				"control id 0x%08x already exists.\n",

			uvc_trace(dev, UVC_TRACE_CONTROL,

				  "Can't add mapping '%s', control id 0x%08x already exists.\n",

				  mapping->name, mapping->id);

			ret = -EEXIST;

			goto done;
@@ -2161,9 +2164,9 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 
	/* Prevent excess memory consumption */

	if (atomic_inc_return(&dev->nmappings) > UVC_MAX_CONTROL_MAPPINGS) {

		atomic_dec(&dev->nmappings);

		uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', maximum "

			"mappings count (%u) exceeded.\n", mapping->name,

			UVC_MAX_CONTROL_MAPPINGS);

		uvc_trace(dev, UVC_TRACE_CONTROL,

			  "Can't add mapping '%s', maximum mappings count (%u) exceeded.\n",

			  mapping->name, UVC_MAX_CONTROL_MAPPINGS);

		ret = -ENOMEM;

		goto done;

	}
@@ -2232,8 +2235,9 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev, 
		    !uvc_test_bit(controls, blacklist[i].index))

			continue;



		uvc_trace(UVC_TRACE_CONTROL, "%u/%u control is black listed, "

			"removing it.\n", entity->id, blacklist[i].index);

		uvc_trace(dev, UVC_TRACE_CONTROL,

			  "%u/%u control is black listed, removing it.\n",

			  entity->id, blacklist[i].index);



		uvc_clear_bit(controls, blacklist[i].index);

	}

drivers/media/usb/uvc/uvc_driver.c

+155 −143
Original line number Diff line number Diff line
@@ -520,8 +520,8 @@ static int uvc_parse_format(struct uvc_device *dev, 
	case UVC_VS_FORMAT_FRAME_BASED:

		n = buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED ? 27 : 28;

		if (buflen < n) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			       "interface %d FORMAT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d FORMAT error\n",

				  dev->udev->devnum,

				  alts->desc.bInterfaceNumber);

			return -EINVAL;
@@ -584,8 +584,8 @@ static int uvc_parse_format(struct uvc_device *dev, 


	case UVC_VS_FORMAT_MJPEG:

		if (buflen < 11) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			       "interface %d FORMAT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d FORMAT error\n",

				  dev->udev->devnum,

				  alts->desc.bInterfaceNumber);

			return -EINVAL;
@@ -600,8 +600,8 @@ static int uvc_parse_format(struct uvc_device *dev, 


	case UVC_VS_FORMAT_DV:

		if (buflen < 9) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			       "interface %d FORMAT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d FORMAT error\n",

				  dev->udev->devnum,

				  alts->desc.bInterfaceNumber);

			return -EINVAL;
@@ -618,8 +618,8 @@ static int uvc_parse_format(struct uvc_device *dev, 
			strscpy(format->name, "HD-DV", sizeof(format->name));

			break;

		default:

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			       "interface %d: unknown DV format %u\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d: unknown DV format %u\n",

				  dev->udev->devnum,

			       alts->desc.bInterfaceNumber, buffer[8]);

			return -EINVAL;
@@ -647,14 +647,14 @@ static int uvc_parse_format(struct uvc_device *dev, 
	case UVC_VS_FORMAT_STREAM_BASED:

		/* Not supported yet. */

	default:

		uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

		       "interface %d unsupported format %u\n",

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d videostreaming interface %d unsupported format %u\n",

			  dev->udev->devnum, alts->desc.bInterfaceNumber,

			  buffer[2]);

		return -EINVAL;

	}



	uvc_trace(UVC_TRACE_DESCR, "Found format %s.\n", format->name);

	uvc_trace(dev, UVC_TRACE_DESCR, "Found format %s.\n", format->name);



	buflen -= buffer[0];

	buffer += buffer[0];
@@ -673,8 +673,9 @@ static int uvc_parse_format(struct uvc_device *dev, 
		n = n ? n : 3;



		if (buflen < 26 + 4*n) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			       "interface %d FRAME error\n", dev->udev->devnum,

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d FRAME error\n",

				  dev->udev->devnum,

				  alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -737,7 +738,7 @@ static int uvc_parse_format(struct uvc_device *dev, 
				frame->dwDefaultFrameInterval;

		}



		uvc_trace(UVC_TRACE_DESCR, "- %ux%u (%u.%u fps)\n",

		uvc_trace(dev, UVC_TRACE_DESCR, "- %ux%u (%u.%u fps)\n",

			  frame->wWidth, frame->wHeight,

			  10000000 / frame->dwDefaultFrameInterval,

			  (100000000 / frame->dwDefaultFrameInterval) % 10);
@@ -756,8 +757,8 @@ static int uvc_parse_format(struct uvc_device *dev, 
	if (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&

	    buffer[2] == UVC_VS_COLORFORMAT) {

		if (buflen < 6) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			       "interface %d COLORFORMAT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d COLORFORMAT error\n",

				  dev->udev->devnum,

				  alts->desc.bInterfaceNumber);

			return -EINVAL;
@@ -791,15 +792,17 @@ static int uvc_parse_streaming(struct uvc_device *dev, 


	if (intf->cur_altsetting->desc.bInterfaceSubClass

		!= UVC_SC_VIDEOSTREAMING) {

		uvc_trace(UVC_TRACE_DESCR, "device %d interface %d isn't a "

			"video streaming interface\n", dev->udev->devnum,

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d interface %d isn't a video streaming interface\n",

			  dev->udev->devnum,

			  intf->altsetting[0].desc.bInterfaceNumber);

		return -EINVAL;

	}



	if (usb_driver_claim_interface(&uvc_driver.driver, intf, dev)) {

		uvc_trace(UVC_TRACE_DESCR, "device %d interface %d is already "

			"claimed\n", dev->udev->devnum,

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d interface %d is already claimed\n",

			  dev->udev->devnum,

			  intf->altsetting[0].desc.bInterfaceNumber);

		return -EINVAL;

	}
@@ -822,8 +825,9 @@ static int uvc_parse_streaming(struct uvc_device *dev, 


			if (ep->extralen > 2 &&

			    ep->extra[1] == USB_DT_CS_INTERFACE) {

				uvc_trace(UVC_TRACE_DESCR, "trying extra data "

					"from endpoint %u.\n", i);

				uvc_trace(dev, UVC_TRACE_DESCR,

					  "trying extra data from endpoint %u.\n",

					  i);

				buffer = alts->endpoint[i].extra;

				buflen = alts->endpoint[i].extralen;

				break;
@@ -838,8 +842,8 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	}



	if (buflen <= 2) {

		uvc_trace(UVC_TRACE_DESCR, "no class-specific streaming "

			"interface descriptors found.\n");

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "no class-specific streaming interface descriptors found.\n");

		goto error;

	}
@@ -856,9 +860,9 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
		break;



	default:

		uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming interface "

			"%d HEADER descriptor not found.\n", dev->udev->devnum,

			alts->desc.bInterfaceNumber);

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d videostreaming interface %d HEADER descriptor not found.\n",

			  dev->udev->devnum, alts->desc.bInterfaceNumber);

		goto error;

	}
@@ -866,8 +870,8 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	n = buflen >= size ? buffer[size-1] : 0;



	if (buflen < size + p*n) {

		uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

			"interface %d HEADER descriptor is invalid.\n",

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d videostreaming interface %d HEADER descriptor is invalid.\n",

			  dev->udev->devnum, alts->desc.bInterfaceNumber);

		goto error;

	}
@@ -918,8 +922,8 @@ static int uvc_parse_streaming(struct uvc_device *dev, 


		case UVC_VS_FORMAT_MPEG2TS:

		case UVC_VS_FORMAT_STREAM_BASED:

			uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "

				"interface %d FORMAT %u is not supported.\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videostreaming interface %d FORMAT %u is not supported.\n",

				  dev->udev->devnum,

				  alts->desc.bInterfaceNumber, _buffer[2]);

			break;
@@ -943,8 +947,8 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	}



	if (nformats == 0) {

		uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming interface "

			"%d has no supported formats defined.\n",

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d videostreaming interface %d has no supported formats defined.\n",

			  dev->udev->devnum, alts->desc.bInterfaceNumber);

		goto error;

	}
@@ -992,9 +996,10 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	}



	if (buflen)

		uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming interface "

			"%d has %u bytes of trailing descriptor garbage.\n",

			dev->udev->devnum, alts->desc.bInterfaceNumber, buflen);

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "device %d videostreaming interface %d has %u bytes of trailing descriptor garbage.\n",

			  dev->udev->devnum, alts->desc.bInterfaceNumber,

			  buflen);



	/* Parse the alternate settings to find the maximum bandwidth. */

	for (i = 0; i < intf->num_altsetting; ++i) {
@@ -1127,8 +1132,8 @@ static int uvc_parse_vendor_control(struct uvc_device *dev, 
		n = buflen >= 25 + p ? buffer[22+p] : 0;



		if (buflen < 25 + p + 2*n) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d EXTENSION_UNIT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d EXTENSION_UNIT error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			break;

		}
@@ -1176,9 +1181,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		n = buflen >= 12 ? buffer[11] : 0;



		if (buflen < 12 + n) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d HEADER error\n", udev->devnum,

				alts->desc.bInterfaceNumber);

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d HEADER error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1189,8 +1194,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		for (i = 0; i < n; ++i) {

			intf = usb_ifnum_to_if(udev, buffer[12+i]);

			if (intf == NULL) {

				uvc_trace(UVC_TRACE_DESCR, "device %d "

					"interface %d doesn't exists\n",

				uvc_trace(dev, UVC_TRACE_DESCR,

					  "device %d interface %d doesn't exists\n",

					  udev->devnum, i);

				continue;

			}
@@ -1201,8 +1206,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 


	case UVC_VC_INPUT_TERMINAL:

		if (buflen < 8) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d INPUT_TERMINAL error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d INPUT_TERMINAL error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1220,10 +1225,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		 */

		type = get_unaligned_le16(&buffer[4]);

		if ((type & 0x7f00) == 0 || (type & 0x8000) != 0) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d INPUT_TERMINAL %d has invalid "

				"type 0x%04x, skipping\n", udev->devnum,

				alts->desc.bInterfaceNumber,

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d INPUT_TERMINAL %d has invalid type 0x%04x, skipping\n",

				  udev->devnum, alts->desc.bInterfaceNumber,

				  buffer[3], type);

			return 0;

		}
@@ -1243,8 +1247,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		}



		if (buflen < len + n + p) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d INPUT_TERMINAL error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d INPUT_TERMINAL error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1290,8 +1294,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 


	case UVC_VC_OUTPUT_TERMINAL:

		if (buflen < 9) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d OUTPUT_TERMINAL error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d OUTPUT_TERMINAL error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1301,10 +1305,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		 */

		type = get_unaligned_le16(&buffer[4]);

		if ((type & 0xff00) == 0) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d OUTPUT_TERMINAL %d has invalid "

				"type 0x%04x, skipping\n", udev->devnum,

				alts->desc.bInterfaceNumber, buffer[3], type);

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d OUTPUT_TERMINAL %d has invalid type 0x%04x, skipping\n",

				  udev->devnum, alts->desc.bInterfaceNumber,

				  buffer[3], type);

			return 0;

		}
@@ -1328,8 +1332,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		p = buflen >= 5 ? buffer[4] : 0;



		if (buflen < 5 || buflen < 6 + p) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d SELECTOR_UNIT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d SELECTOR_UNIT error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1354,8 +1358,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		p = dev->uvc_version >= 0x0110 ? 10 : 9;



		if (buflen < p + n) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d PROCESSING_UNIT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d PROCESSING_UNIT error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1387,8 +1391,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		n = buflen >= 24 + p ? buffer[22+p] : 0;



		if (buflen < 24 + p + n) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d EXTENSION_UNIT error\n",

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "device %d videocontrol interface %d EXTENSION_UNIT error\n",

				  udev->devnum, alts->desc.bInterfaceNumber);

			return -EINVAL;

		}
@@ -1414,8 +1418,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
		break;



	default:

		uvc_trace(UVC_TRACE_DESCR, "Found an unknown CS_INTERFACE "

			"descriptor (%u)\n", buffer[2]);

		uvc_trace(dev, UVC_TRACE_DESCR,

			  "Found an unknown CS_INTERFACE descriptor (%u)\n",

			  buffer[2]);

		break;

	}
@@ -1460,8 +1465,9 @@ static int uvc_parse_control(struct uvc_device *dev) 
		if (usb_endpoint_is_int_in(desc) &&

		    le16_to_cpu(desc->wMaxPacketSize) >= 8 &&

		    desc->bInterval != 0) {

			uvc_trace(UVC_TRACE_DESCR, "Found a Status endpoint "

				"(addr %02x).\n", desc->bEndpointAddress);

			uvc_trace(dev, UVC_TRACE_DESCR,

				  "Found a Status endpoint (addr %02x).\n",

				  desc->bEndpointAddress);

			dev->int_ep = ep;

		}

	}
@@ -1609,8 +1615,9 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, 
		uvc_trace_cont(UVC_TRACE_PROBE, " <- XU %d", entity->id);



		if (entity->bNrInPins != 1) {

			uvc_trace(UVC_TRACE_DESCR, "Extension unit %d has more "

				"than 1 input pin.\n", entity->id);

			uvc_trace(chain->dev, UVC_TRACE_DESCR,

				  "Extension unit %d has more than 1 input pin.\n",

				  entity->id);

			return -1;

		}
@@ -1620,8 +1627,8 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, 
		uvc_trace_cont(UVC_TRACE_PROBE, " <- PU %d", entity->id);



		if (chain->processing != NULL) {

			uvc_trace(UVC_TRACE_DESCR, "Found multiple "

				"Processing Units in chain.\n");

			uvc_trace(chain->dev, UVC_TRACE_DESCR,

				  "Found multiple Processing Units in chain.\n");

			return -1;

		}
@@ -1636,8 +1643,8 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, 
			break;



		if (chain->selector != NULL) {

			uvc_trace(UVC_TRACE_DESCR, "Found multiple Selector "

				"Units in chain.\n");

			uvc_trace(chain->dev, UVC_TRACE_DESCR,

				  "Found multiple Selector Units in chain.\n");

			return -1;

		}
@@ -1667,8 +1674,9 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, 
		break;



	default:

		uvc_trace(UVC_TRACE_DESCR, "Unsupported entity type "

			"0x%04x found in chain.\n", UVC_ENTITY_TYPE(entity));

		uvc_trace(chain->dev, UVC_TRACE_DESCR,

			  "Unsupported entity type 0x%04x found in chain.\n",

			  UVC_ENTITY_TYPE(entity));

		return -1;

	}
@@ -1694,16 +1702,17 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain, 
		if (forward == prev)

			continue;

		if (forward->chain.next || forward->chain.prev) {

			uvc_trace(UVC_TRACE_DESCR, "Found reference to "

				"entity %d already in chain.\n", forward->id);

			uvc_trace(chain->dev, UVC_TRACE_DESCR,

				  "Found reference to entity %d already in chain.\n",

				  forward->id);

			return -EINVAL;

		}



		switch (UVC_ENTITY_TYPE(forward)) {

		case UVC_VC_EXTENSION_UNIT:

			if (forward->bNrInPins != 1) {

				uvc_trace(UVC_TRACE_DESCR, "Extension unit %d "

					  "has more than 1 input pin.\n",

				uvc_trace(chain->dev, UVC_TRACE_DESCR,

					  "Extension unit %d has more than 1 input pin.\n",

					  entity->id);

				return -EINVAL;

			}
@@ -1721,8 +1730,9 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain, 
		case UVC_OTT_MEDIA_TRANSPORT_OUTPUT:

		case UVC_TT_STREAMING:

			if (UVC_ENTITY_IS_ITERM(forward)) {

				uvc_trace(UVC_TRACE_DESCR, "Unsupported input "

					"terminal %u.\n", forward->id);

				uvc_trace(chain->dev, UVC_TRACE_DESCR,

					  "Unsupported input terminal %u.\n",

					  forward->id);

				return -EINVAL;

			}
@@ -1768,15 +1778,15 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain, 
			id = entity->baSourceID[i];

			term = uvc_entity_by_id(chain->dev, id);

			if (term == NULL || !UVC_ENTITY_IS_ITERM(term)) {

				uvc_trace(UVC_TRACE_DESCR, "Selector unit %d "

					"input %d isn't connected to an "

					"input terminal\n", entity->id, i);

				uvc_trace(chain->dev, UVC_TRACE_DESCR,

					  "Selector unit %d input %d isn't connected to an input terminal\n",

					  entity->id, i);

				return -1;

			}



			if (term->chain.next || term->chain.prev) {

				uvc_trace(UVC_TRACE_DESCR, "Found reference to "

					"entity %d already in chain.\n",

				uvc_trace(chain->dev, UVC_TRACE_DESCR,

					  "Found reference to entity %d already in chain.\n",

					  term->id);

				return -EINVAL;

			}
@@ -1810,8 +1820,8 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain, 


	entity = uvc_entity_by_id(chain->dev, id);

	if (entity == NULL) {

		uvc_trace(UVC_TRACE_DESCR, "Found reference to "

			"unknown entity %d.\n", id);

		uvc_trace(chain->dev, UVC_TRACE_DESCR,

			  "Found reference to unknown entity %d.\n", id);

		return -EINVAL;

	}
@@ -1824,7 +1834,7 @@ static int uvc_scan_chain(struct uvc_video_chain *chain, 
{

	struct uvc_entity *entity, *prev;



	uvc_trace(UVC_TRACE_PROBE, "Scanning UVC chain:");

	uvc_trace(chain->dev, UVC_TRACE_PROBE, "Scanning UVC chain:");



	entity = term;

	prev = NULL;
@@ -1832,8 +1842,9 @@ static int uvc_scan_chain(struct uvc_video_chain *chain, 
	while (entity != NULL) {

		/* Entity must not be part of an existing chain */

		if (entity->chain.next || entity->chain.prev) {

			uvc_trace(UVC_TRACE_DESCR, "Found reference to "

				"entity %d already in chain.\n", entity->id);

			uvc_trace(chain->dev, UVC_TRACE_DESCR,

				  "Found reference to entity %d already in chain.\n",

				  entity->id);

			return -EINVAL;

		}
@@ -1987,7 +1998,7 @@ static int uvc_scan_fallback(struct uvc_device *dev) 


	list_add_tail(&chain->list, &dev->chains);



	uvc_trace(UVC_TRACE_PROBE,

	uvc_trace(dev, UVC_TRACE_PROBE,

		  "Found a video chain by fallback heuristic (%s).\n",

		  uvc_print_chain(chain));
@@ -2031,7 +2042,8 @@ static int uvc_scan_device(struct uvc_device *dev) 
			continue;

		}



		uvc_trace(UVC_TRACE_PROBE, "Found a valid video chain (%s).\n",

		uvc_trace(dev, UVC_TRACE_PROBE,

			  "Found a valid video chain (%s).\n",

			  uvc_print_chain(chain));



		list_add_tail(&chain->list, &dev->chains);
@@ -2312,14 +2324,6 @@ static int uvc_probe(struct usb_interface *intf, 
	int function;

	int ret;



	if (id->idVendor && id->idProduct)

		uvc_trace(UVC_TRACE_PROBE, "Probing known UVC device %s "

				"(%04x:%04x)\n", udev->devpath, id->idVendor,

				id->idProduct);

	else

		uvc_trace(UVC_TRACE_PROBE, "Probing generic UVC device %s\n",

				udev->devpath);



	/* Allocate memory for the device and initialize it. */

	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (dev == NULL)
@@ -2339,6 +2343,14 @@ static int uvc_probe(struct usb_interface *intf, 
	dev->quirks = uvc_quirks_param == -1

		    ? dev->info->quirks : uvc_quirks_param;



	if (id->idVendor && id->idProduct)

		uvc_trace(dev, UVC_TRACE_PROBE,

			  "Probing known UVC device %s (%04x:%04x)\n",

			  udev->devpath, id->idVendor, id->idProduct);

	else

		uvc_trace(dev, UVC_TRACE_PROBE,

			  "Probing generic UVC device %s\n", udev->devpath);



	if (udev->product != NULL)

		strscpy(dev->name, udev->product, sizeof(dev->name));

	else
@@ -2381,14 +2393,14 @@ static int uvc_probe(struct usb_interface *intf, 


	/* Parse the Video Class control descriptor. */

	if (uvc_parse_control(dev) < 0) {

		uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC "

			"descriptors.\n");

		uvc_trace(dev, UVC_TRACE_PROBE,

			  "Unable to parse UVC descriptors.\n");

		goto error;

	}



	/* Parse the associated GPIOs. */

	if (uvc_gpio_parse(dev) < 0) {

		uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC GPIOs\n");

		uvc_trace(dev, UVC_TRACE_PROBE, "Unable to parse UVC GPIOs\n");

		goto error;

	}
@@ -2450,7 +2462,7 @@ static int uvc_probe(struct usb_interface *intf, 
		goto error;

	}



	uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n");

	uvc_trace(dev, UVC_TRACE_PROBE, "UVC device initialized.\n");

	usb_enable_autosuspend(udev);

	return 0;
@@ -2482,7 +2494,7 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message) 
	struct uvc_device *dev = usb_get_intfdata(intf);

	struct uvc_streaming *stream;



	uvc_trace(UVC_TRACE_SUSPEND, "Suspending interface %u\n",

	uvc_trace(dev, UVC_TRACE_SUSPEND, "Suspending interface %u\n",

		intf->cur_altsetting->desc.bInterfaceNumber);



	/* Controls are cached on the fly so they don't need to be saved. */
@@ -2500,8 +2512,8 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message) 
			return uvc_video_suspend(stream);

	}



	uvc_trace(UVC_TRACE_SUSPEND, "Suspend: video streaming USB interface "

			"mismatch.\n");

	uvc_trace(dev, UVC_TRACE_SUSPEND,

		  "Suspend: video streaming USB interface mismatch.\n");

	return -EINVAL;

}
@@ -2511,7 +2523,7 @@ static int __uvc_resume(struct usb_interface *intf, int reset) 
	struct uvc_streaming *stream;

	int ret = 0;



	uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n",

	uvc_trace(dev, UVC_TRACE_SUSPEND, "Resuming interface %u\n",

		  intf->cur_altsetting->desc.bInterfaceNumber);



	if (intf->cur_altsetting->desc.bInterfaceSubClass ==
@@ -2540,8 +2552,8 @@ static int __uvc_resume(struct usb_interface *intf, int reset) 
		}

	}



	uvc_trace(UVC_TRACE_SUSPEND, "Resume: video streaming USB interface "

			"mismatch.\n");

	uvc_trace(dev, UVC_TRACE_SUSPEND,

		  "Resume: video streaming USB interface mismatch.\n");

	return -EINVAL;

}

drivers/media/usb/uvc/uvc_isight.c

+9 −7
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, 
		0xde, 0xad, 0xfa, 0xce

	};



	struct uvc_streaming *stream = uvc_queue_to_stream(queue);

	unsigned int maxlen, nbytes;

	u8 *mem;

	int is_header = 0;
@@ -49,15 +50,16 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, 


	if ((len >= 14 && memcmp(&data[2], hdr, 12) == 0) ||

	    (len >= 15 && memcmp(&data[3], hdr, 12) == 0)) {

		uvc_trace(UVC_TRACE_FRAME, "iSight header found\n");

		uvc_trace(stream->dev, UVC_TRACE_FRAME,

			  "iSight header found\n");

		is_header = 1;

	}



	/* Synchronize to the input stream by waiting for a header packet. */

	if (buf->state != UVC_BUF_STATE_ACTIVE) {

		if (!is_header) {

			uvc_trace(UVC_TRACE_FRAME, "Dropping packet (out of "

				  "sync).\n");

			uvc_trace(stream->dev, UVC_TRACE_FRAME,

				  "Dropping packet (out of sync).\n");

			return 0;

		}
@@ -85,8 +87,8 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, 
		buf->bytesused += nbytes;



		if (len > maxlen || buf->bytesused == buf->length) {

			uvc_trace(UVC_TRACE_FRAME, "Frame complete "

				  "(overflow).\n");

			uvc_trace(stream->dev, UVC_TRACE_FRAME,

				  "Frame complete (overflow).\n");

			buf->state = UVC_BUF_STATE_DONE;

		}

	}
@@ -103,8 +105,8 @@ void uvc_video_decode_isight(struct uvc_urb *uvc_urb, struct uvc_buffer *buf, 


	for (i = 0; i < urb->number_of_packets; ++i) {

		if (urb->iso_frame_desc[i].status < 0) {

			uvc_trace(UVC_TRACE_FRAME, "USB isochronous frame "

				  "lost (%d).\n",

			uvc_trace(stream->dev, UVC_TRACE_FRAME,

				  "USB isochronous frame lost (%d).\n",

				  urb->iso_frame_desc[i].status);

		}

drivers/media/usb/uvc/uvc_queue.c

+2 −7
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 
 * the driver.

 */



static inline struct uvc_streaming *

uvc_queue_to_stream(struct uvc_video_queue *queue)

{

	return container_of(queue, struct uvc_streaming, queue);

}



static inline struct uvc_buffer *uvc_vbuf_to_buffer(struct vb2_v4l2_buffer *buf)

{

	return container_of(buf, struct uvc_buffer, buf);
@@ -109,7 +103,8 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb) 


	if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&

	    vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) {

		uvc_trace(UVC_TRACE_CAPTURE, "[E] Bytes used out of bounds.\n");

		uvc_trace(uvc_queue_to_stream(queue)->dev, UVC_TRACE_CAPTURE,

			  "[E] Bytes used out of bounds.\n");

		return -EINVAL;

	}

drivers/media/usb/uvc/uvc_status.c

+10 −9

File changed.

Preview size limit exceeded, changes collapsed.