Commit 7564f67d authored May 02, 2009 by Hans Verkuil Committed by Mauro Carvalho Chehab May 09, 2009

V4L/DVB (11669): uvc: fix compile warning



The 2.6.30 kernel generates this warning:

uvc_driver.c:1729: warning: 'ret' may be used uninitialized in this function

I guess some new warning flag must have been turned on since this warning
didn't appear with older kernels (gcc version 4.3.1). It's also a bogus
warning, but since this code didn't comply to the coding standard anyway
I've modified it to 1) remove the warning and 2) conform to the coding
standard.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 34a7864d

drivers/media/video/uvc/uvc_driver.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1726,14 +1726,17 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message)
		static int __uvc_resume(struct usb_interface *intf, int reset)
		{
		struct uvc_device *dev = usb_get_intfdata(intf);
		int ret;

		uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n",
		intf->cur_altsetting->desc.bInterfaceNumber);

		if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) {
		if (reset && (ret = uvc_ctrl_resume_device(dev)) < 0)
		if (reset) {
		int ret = uvc_ctrl_resume_device(dev);

		if (ret < 0)
		return ret;
		}

		return uvc_status_resume(dev);
		}