Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72cd3a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: pwc : do not pass stack allocated buffers to USB core.
  USB: otg: Fix bug on remove path without transceiver
  USB: correct error handling in cdc-wdm
  USB: removal of tty->low_latency hack dating back to the old serial code
  USB: serial: sierra driver bug fix for composite interface
  USB: gadget: omap_udc uses platform_driver_probe()
  USB: ci13xxx_udc: fix build error
  USB: musb: Prevent multiple includes of musb.h
  USB: pass mem_flags to dma_alloc_coherent
  USB: g_file_storage: fix use-after-free bug when closing files
  USB: ehci-sched.c: EHCI SITD scheduling bugfix
  USB: fix mos7840 problem with minor numbers
  USB: mos7840: add new device id
  USB: musb: fix build when !CONFIG_PM
  USB: musb: Remove my email address from few musb related drivers
  USB: Gadget: MIPS CI13xxx UDC bugfixes
  USB: Unusual Device support for Gold MP3 Player Energy
  USB: serial: fix lifetime and locking problems
parents ff91fad2 6b35ca0d

drivers/media/video/pwc/pwc-ctrl.c

+164 −74
Original line number Diff line number Diff line
@@ -159,35 +159,67 @@ static void pwc_set_image_buffer_size(struct pwc_device *pdev); 


/****************************************************************************/



static int _send_control_msg(struct pwc_device *pdev,

	u8 request, u16 value, int index, void *buf, int buflen, int timeout)

{

	int rc;

	void *kbuf = NULL;



	if (buflen) {

		kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */

		if (kbuf == NULL)

			return -ENOMEM;

		memcpy(kbuf, buf, buflen);

	}



	rc = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),

		request,

		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

		value,

		index,

		kbuf, buflen, timeout);



	kfree(kbuf);

	return rc;

}



#define SendControlMsg(request, value, buflen) \

	usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0), \

		request, \

		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, \

		value, \

		pdev->vcinterface, \

		&buf, buflen, 500)

static int recv_control_msg(struct pwc_device *pdev,

	u8 request, u16 value, void *buf, int buflen)

{

	int rc;

	void *kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */



#define RecvControlMsg(request, value, buflen) \

	usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0), \

		request, \

		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, \

		value, \

		pdev->vcinterface, \

		&buf, buflen, 500)

	if (kbuf == NULL)

		return -ENOMEM;



	rc = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),

		request,

		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

		value,

		pdev->vcinterface,

		kbuf, buflen, 500);

	memcpy(buf, kbuf, buflen);

	kfree(kbuf);

	return rc;

}



static int send_video_command(struct usb_device *udev, int index, void *buf, int buflen)

static inline int send_video_command(struct pwc_device *pdev,

	int index, void *buf, int buflen)

{

	return usb_control_msg(udev,

		usb_sndctrlpipe(udev, 0),

	return _send_control_msg(pdev,

		SET_EP_STREAM_CTL,

		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

		VIDEO_OUTPUT_CONTROL_FORMATTER,

		index,

		buf, buflen, 1000);

}



static inline int send_control_msg(struct pwc_device *pdev,

	u8 request, u16 value, void *buf, int buflen)

{

	return _send_control_msg(pdev,

		request, value, pdev->vcinterface, buf, buflen, 500);

}







static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames)
@@ -224,7 +256,7 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames) 
		return -EINVAL;



	memcpy(buf, pEntry->mode, 3);

	ret = send_video_command(pdev->udev, pdev->vendpoint, buf, 3);

	ret = send_video_command(pdev, pdev->vendpoint, buf, 3);

	if (ret < 0) {

		PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret);

		return ret;
@@ -285,7 +317,7 @@ static int set_video_mode_Timon(struct pwc_device *pdev, int size, int frames, i 
	memcpy(buf, pChoose->mode, 13);

	if (snapshot)

		buf[0] |= 0x80;

	ret = send_video_command(pdev->udev, pdev->vendpoint, buf, 13);

	ret = send_video_command(pdev, pdev->vendpoint, buf, 13);

	if (ret < 0)

		return ret;
@@ -358,7 +390,7 @@ static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int frames, i 
		buf[0] |= 0x80;



	/* Firmware bug: video endpoint is 5, but commands are sent to endpoint 4 */

	ret = send_video_command(pdev->udev, 4 /* pdev->vendpoint */, buf, 12);

	ret = send_video_command(pdev, 4 /* pdev->vendpoint */, buf, 12);

	if (ret < 0)

		return ret;
@@ -530,7 +562,8 @@ int pwc_get_brightness(struct pwc_device *pdev) 
	char buf;

	int ret;



	ret = RecvControlMsg(GET_LUM_CTL, BRIGHTNESS_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, BRIGHTNESS_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	return buf;
@@ -545,7 +578,8 @@ int pwc_set_brightness(struct pwc_device *pdev, int value) 
	if (value > 0xffff)

		value = 0xffff;

	buf = (value >> 9) & 0x7f;

	return SendControlMsg(SET_LUM_CTL, BRIGHTNESS_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_LUM_CTL, BRIGHTNESS_FORMATTER, &buf, sizeof(buf));

}



/* CONTRAST */
@@ -555,7 +589,8 @@ int pwc_get_contrast(struct pwc_device *pdev) 
	char buf;

	int ret;



	ret = RecvControlMsg(GET_LUM_CTL, CONTRAST_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, CONTRAST_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	return buf;
@@ -570,7 +605,8 @@ int pwc_set_contrast(struct pwc_device *pdev, int value) 
	if (value > 0xffff)

		value = 0xffff;

	buf = (value >> 10) & 0x3f;

	return SendControlMsg(SET_LUM_CTL, CONTRAST_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_LUM_CTL, CONTRAST_FORMATTER, &buf, sizeof(buf));

}



/* GAMMA */
@@ -580,7 +616,8 @@ int pwc_get_gamma(struct pwc_device *pdev) 
	char buf;

	int ret;



	ret = RecvControlMsg(GET_LUM_CTL, GAMMA_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, GAMMA_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	return buf;
@@ -595,7 +632,8 @@ int pwc_set_gamma(struct pwc_device *pdev, int value) 
	if (value > 0xffff)

		value = 0xffff;

	buf = (value >> 11) & 0x1f;

	return SendControlMsg(SET_LUM_CTL, GAMMA_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_LUM_CTL, GAMMA_FORMATTER, &buf, sizeof(buf));

}
@@ -613,7 +651,8 @@ int pwc_get_saturation(struct pwc_device *pdev, int *value) 
		saturation_register = SATURATION_MODE_FORMATTER2;

	else

		saturation_register = SATURATION_MODE_FORMATTER1;

	ret = RecvControlMsg(GET_CHROM_CTL, saturation_register, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, saturation_register, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*value = (signed)buf;
@@ -636,7 +675,8 @@ int pwc_set_saturation(struct pwc_device *pdev, int value) 
		saturation_register = SATURATION_MODE_FORMATTER2;

	else

		saturation_register = SATURATION_MODE_FORMATTER1;

	return SendControlMsg(SET_CHROM_CTL, saturation_register, 1);

	return send_control_msg(pdev,

		SET_CHROM_CTL, saturation_register, &buf, sizeof(buf));

}



/* AGC */
@@ -651,7 +691,8 @@ int pwc_set_agc(struct pwc_device *pdev, int mode, int value) 
	else

		buf = 0xff; /* fixed */



	ret = SendControlMsg(SET_LUM_CTL, AGC_MODE_FORMATTER, 1);

	ret = send_control_msg(pdev,

		SET_LUM_CTL, AGC_MODE_FORMATTER, &buf, sizeof(buf));



	if (!mode && ret >= 0) {

		if (value < 0)
@@ -659,7 +700,8 @@ int pwc_set_agc(struct pwc_device *pdev, int mode, int value) 
		if (value > 0xffff)

			value = 0xffff;

		buf = (value >> 10) & 0x3F;

		ret = SendControlMsg(SET_LUM_CTL, PRESET_AGC_FORMATTER, 1);

		ret = send_control_msg(pdev,

			SET_LUM_CTL, PRESET_AGC_FORMATTER, &buf, sizeof(buf));

	}

	if (ret < 0)

		return ret;
@@ -671,12 +713,14 @@ int pwc_get_agc(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_LUM_CTL, AGC_MODE_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, AGC_MODE_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;



	if (buf != 0) { /* fixed */

		ret = RecvControlMsg(GET_LUM_CTL, PRESET_AGC_FORMATTER, 1);

		ret = recv_control_msg(pdev,

			GET_LUM_CTL, PRESET_AGC_FORMATTER, &buf, sizeof(buf));

		if (ret < 0)

			return ret;

		if (buf > 0x3F)
@@ -684,7 +728,8 @@ int pwc_get_agc(struct pwc_device *pdev, int *value) 
		*value = (buf << 10);

	}

	else { /* auto */

		ret = RecvControlMsg(GET_STATUS_CTL, READ_AGC_FORMATTER, 1);

		ret = recv_control_msg(pdev,

			GET_STATUS_CTL, READ_AGC_FORMATTER, &buf, sizeof(buf));

		if (ret < 0)

			return ret;

		/* Gah... this value ranges from 0x00 ... 0x9F */
@@ -707,7 +752,8 @@ int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value) 
	else

		buf[0] = 0xff; /* fixed */



	ret = SendControlMsg(SET_LUM_CTL, SHUTTER_MODE_FORMATTER, 1);

	ret = send_control_msg(pdev,

		SET_LUM_CTL, SHUTTER_MODE_FORMATTER, &buf, sizeof(buf));



	if (!mode && ret >= 0) {

		if (value < 0)
@@ -726,7 +772,9 @@ int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value) 
			buf[0] = value >> 8;

		}



		ret = SendControlMsg(SET_LUM_CTL, PRESET_SHUTTER_FORMATTER, 2);

		ret = send_control_msg(pdev,

			SET_LUM_CTL, PRESET_SHUTTER_FORMATTER,

			&buf, sizeof(buf));

	}

	return ret;

}
@@ -737,7 +785,8 @@ int pwc_get_shutter_speed(struct pwc_device *pdev, int *value) 
	unsigned char buf[2];

	int ret;



	ret = RecvControlMsg(GET_STATUS_CTL, READ_SHUTTER_FORMATTER, 2);

	ret = recv_control_msg(pdev,

		GET_STATUS_CTL, READ_SHUTTER_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*value = buf[0] + (buf[1] << 8);
@@ -764,7 +813,9 @@ int pwc_camera_power(struct pwc_device *pdev, int power) 
		buf = 0x00; /* active */

	else

		buf = 0xFF; /* power save */

	return SendControlMsg(SET_STATUS_CTL, SET_POWER_SAVE_MODE_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_STATUS_CTL, SET_POWER_SAVE_MODE_FORMATTER,

		&buf, sizeof(buf));

}
@@ -773,20 +824,20 @@ int pwc_camera_power(struct pwc_device *pdev, int power) 


int pwc_restore_user(struct pwc_device *pdev)

{

	char buf; /* dummy */

	return SendControlMsg(SET_STATUS_CTL, RESTORE_USER_DEFAULTS_FORMATTER, 0);

	return send_control_msg(pdev,

		SET_STATUS_CTL, RESTORE_USER_DEFAULTS_FORMATTER, NULL, 0);

}



int pwc_save_user(struct pwc_device *pdev)

{

	char buf; /* dummy */

	return SendControlMsg(SET_STATUS_CTL, SAVE_USER_DEFAULTS_FORMATTER, 0);

	return send_control_msg(pdev,

		SET_STATUS_CTL, SAVE_USER_DEFAULTS_FORMATTER, NULL, 0);

}



int pwc_restore_factory(struct pwc_device *pdev)

{

	char buf; /* dummy */

	return SendControlMsg(SET_STATUS_CTL, RESTORE_FACTORY_DEFAULTS_FORMATTER, 0);

	return send_control_msg(pdev,

		SET_STATUS_CTL, RESTORE_FACTORY_DEFAULTS_FORMATTER, NULL, 0);

}



 /* ************************************************* */
@@ -814,7 +865,8 @@ int pwc_set_awb(struct pwc_device *pdev, int mode) 


	buf = mode & 0x07; /* just the lowest three bits */



	ret = SendControlMsg(SET_CHROM_CTL, WB_MODE_FORMATTER, 1);

	ret = send_control_msg(pdev,

		SET_CHROM_CTL, WB_MODE_FORMATTER, &buf, sizeof(buf));



	if (ret < 0)

		return ret;
@@ -826,7 +878,8 @@ int pwc_get_awb(struct pwc_device *pdev) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_CHROM_CTL, WB_MODE_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, WB_MODE_FORMATTER, &buf, sizeof(buf));



	if (ret < 0)

		return ret;
@@ -843,7 +896,9 @@ int pwc_set_red_gain(struct pwc_device *pdev, int value) 
		value = 0xffff;

	/* only the msb is considered */

	buf = value >> 8;

	return SendControlMsg(SET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER,

		&buf, sizeof(buf));

}



int pwc_get_red_gain(struct pwc_device *pdev, int *value)
@@ -851,7 +906,9 @@ int pwc_get_red_gain(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER,

		&buf, sizeof(buf));

	if (ret < 0)

	    return ret;

	*value = buf << 8;
@@ -869,7 +926,9 @@ int pwc_set_blue_gain(struct pwc_device *pdev, int value) 
		value = 0xffff;

	/* only the msb is considered */

	buf = value >> 8;

	return SendControlMsg(SET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER,

		&buf, sizeof(buf));

}



int pwc_get_blue_gain(struct pwc_device *pdev, int *value)
@@ -877,7 +936,9 @@ int pwc_get_blue_gain(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER,

		&buf, sizeof(buf));

	if (ret < 0)

	    return ret;

	*value = buf << 8;
@@ -894,7 +955,8 @@ static int pwc_read_red_gain(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_STATUS_CTL, READ_RED_GAIN_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_STATUS_CTL, READ_RED_GAIN_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*value = buf << 8;
@@ -906,7 +968,8 @@ static int pwc_read_blue_gain(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_STATUS_CTL, READ_BLUE_GAIN_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_STATUS_CTL, READ_BLUE_GAIN_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*value = buf << 8;
@@ -920,7 +983,8 @@ static int pwc_set_wb_speed(struct pwc_device *pdev, int speed) 


	/* useful range is 0x01..0x20 */

	buf = speed / 0x7f0;

	return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, &buf, sizeof(buf));

}



static int pwc_get_wb_speed(struct pwc_device *pdev, int *value)
@@ -928,7 +992,8 @@ static int pwc_get_wb_speed(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*value = buf * 0x7f0;
@@ -942,7 +1007,8 @@ static int pwc_set_wb_delay(struct pwc_device *pdev, int delay) 


	/* useful range is 0x01..0x3F */

	buf = (delay >> 10);

	return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, &buf, sizeof(buf));

}



static int pwc_get_wb_delay(struct pwc_device *pdev, int *value)
@@ -950,7 +1016,8 @@ static int pwc_get_wb_delay(struct pwc_device *pdev, int *value) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*value = buf << 10;
@@ -978,7 +1045,8 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value) 
	buf[0] = on_value;

	buf[1] = off_value;



	return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2);

	return send_control_msg(pdev,

		SET_STATUS_CTL, LED_FORMATTER, &buf, sizeof(buf));

}



static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
@@ -992,7 +1060,8 @@ static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value) 
		return 0;

	}



	ret = RecvControlMsg(GET_STATUS_CTL, LED_FORMATTER, 2);

	ret = recv_control_msg(pdev,

		GET_STATUS_CTL, LED_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*on_value = buf[0] * 100;
@@ -1009,7 +1078,8 @@ int pwc_set_contour(struct pwc_device *pdev, int contour) 
		buf = 0xff; /* auto contour on */

	else

		buf = 0x0; /* auto contour off */

	ret = SendControlMsg(SET_LUM_CTL, AUTO_CONTOUR_FORMATTER, 1);

	ret = send_control_msg(pdev,

		SET_LUM_CTL, AUTO_CONTOUR_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;
@@ -1019,7 +1089,8 @@ int pwc_set_contour(struct pwc_device *pdev, int contour) 
		contour = 0xffff;



	buf = (contour >> 10); /* contour preset is [0..3f] */

	ret = SendControlMsg(SET_LUM_CTL, PRESET_CONTOUR_FORMATTER, 1);

	ret = send_control_msg(pdev,

		SET_LUM_CTL, PRESET_CONTOUR_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	return 0;
@@ -1030,13 +1101,16 @@ int pwc_get_contour(struct pwc_device *pdev, int *contour) 
	unsigned char buf;

	int ret;



	ret = RecvControlMsg(GET_LUM_CTL, AUTO_CONTOUR_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, AUTO_CONTOUR_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;



	if (buf == 0) {

		/* auto mode off, query current preset value */

		ret = RecvControlMsg(GET_LUM_CTL, PRESET_CONTOUR_FORMATTER, 1);

		ret = recv_control_msg(pdev,

			GET_LUM_CTL, PRESET_CONTOUR_FORMATTER,

			&buf, sizeof(buf));

		if (ret < 0)

			return ret;

		*contour = buf << 10;
@@ -1055,7 +1129,9 @@ int pwc_set_backlight(struct pwc_device *pdev, int backlight) 
		buf = 0xff;

	else

		buf = 0x0;

	return SendControlMsg(SET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER,

		&buf, sizeof(buf));

}



int pwc_get_backlight(struct pwc_device *pdev, int *backlight)
@@ -1063,7 +1139,9 @@ int pwc_get_backlight(struct pwc_device *pdev, int *backlight) 
	int ret;

	unsigned char buf;



	ret = RecvControlMsg(GET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER,

		&buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*backlight = !!buf;
@@ -1078,7 +1156,8 @@ int pwc_set_colour_mode(struct pwc_device *pdev, int colour) 
		buf = 0xff;

	else

		buf = 0x0;

	return SendControlMsg(SET_CHROM_CTL, COLOUR_MODE_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_CHROM_CTL, COLOUR_MODE_FORMATTER, &buf, sizeof(buf));

}



int pwc_get_colour_mode(struct pwc_device *pdev, int *colour)
@@ -1086,7 +1165,8 @@ int pwc_get_colour_mode(struct pwc_device *pdev, int *colour) 
	int ret;

	unsigned char buf;



	ret = RecvControlMsg(GET_CHROM_CTL, COLOUR_MODE_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_CHROM_CTL, COLOUR_MODE_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*colour = !!buf;
@@ -1102,7 +1182,8 @@ int pwc_set_flicker(struct pwc_device *pdev, int flicker) 
		buf = 0xff;

	else

		buf = 0x0;

	return SendControlMsg(SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, &buf, sizeof(buf));

}



int pwc_get_flicker(struct pwc_device *pdev, int *flicker)
@@ -1110,7 +1191,8 @@ int pwc_get_flicker(struct pwc_device *pdev, int *flicker) 
	int ret;

	unsigned char buf;



	ret = RecvControlMsg(GET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*flicker = !!buf;
@@ -1126,7 +1208,9 @@ int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise) 
	if (noise > 3)

		noise = 3;

	buf = noise;

	return SendControlMsg(SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER,

		&buf, sizeof(buf));

}



int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise)
@@ -1134,7 +1218,9 @@ int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise) 
	int ret;

	unsigned char buf;



	ret = RecvControlMsg(GET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1);

	ret = recv_control_msg(pdev,

		GET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER,

		&buf, sizeof(buf));

	if (ret < 0)

		return ret;

	*noise = buf;
@@ -1146,7 +1232,8 @@ static int _pwc_mpt_reset(struct pwc_device *pdev, int flags) 
	unsigned char buf;



	buf = flags & 0x03; // only lower two bits are currently used

	return SendControlMsg(SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, 1);

	return send_control_msg(pdev,

		SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, &buf, sizeof(buf));

}



int pwc_mpt_reset(struct pwc_device *pdev, int flags)
@@ -1175,7 +1262,8 @@ static int _pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt) 
	buf[1] = (pan >> 8) & 0xFF;

	buf[2] = tilt & 0xFF;

	buf[3] = (tilt >> 8) & 0xFF;

	return SendControlMsg(SET_MPT_CTL, PT_RELATIVE_CONTROL_FORMATTER, 4);

	return send_control_msg(pdev,

		SET_MPT_CTL, PT_RELATIVE_CONTROL_FORMATTER, &buf, sizeof(buf));

}



int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)
@@ -1211,7 +1299,8 @@ static int pwc_mpt_get_status(struct pwc_device *pdev, struct pwc_mpt_status *st 
	int ret;

	unsigned char buf[5];



	ret = RecvControlMsg(GET_MPT_CTL, PT_STATUS_FORMATTER, 5);

	ret = recv_control_msg(pdev,

		GET_MPT_CTL, PT_STATUS_FORMATTER, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	status->status = buf[0] & 0x7; // 3 bits are used for reporting
@@ -1233,7 +1322,8 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor) 
	else

		request = SENSOR_TYPE_FORMATTER2;



	ret = RecvControlMsg(GET_STATUS_CTL, request, 1);

	ret = recv_control_msg(pdev,

		GET_STATUS_CTL, request, &buf, sizeof(buf));

	if (ret < 0)

		return ret;

	if (pdev->type < 675)

drivers/usb/class/cdc-wdm.c

+18 −9
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * This driver supports USB CDC WCM Device Management.

 *

 * Copyright (c) 2007-2008 Oliver Neukum

 * Copyright (c) 2007-2009 Oliver Neukum

 *

 * Some code taken from cdc-acm.c

 *
@@ -610,7 +610,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	if (!buffer)

		goto out;



	while (buflen > 0) {

	while (buflen > 2) {

		if (buffer [1] != USB_DT_CS_INTERFACE) {

			dev_err(&intf->dev, "skipping garbage\n");

			goto next_desc;
@@ -646,16 +646,18 @@ next_desc: 
	spin_lock_init(&desc->iuspin);

	init_waitqueue_head(&desc->wait);

	desc->wMaxCommand = maxcom;

	/* this will be expanded and needed in hardware endianness */

	desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber);

	desc->intf = intf;

	INIT_WORK(&desc->rxwork, wdm_rxwork);



	iface = &intf->altsetting[0];

	ep = &iface->endpoint[0].desc;

	if (!ep || !usb_endpoint_is_int_in(ep)) {

	rv = -EINVAL;

	iface = intf->cur_altsetting;

	if (iface->desc.bNumEndpoints != 1)

		goto err;

	ep = &iface->endpoint[0].desc;

	if (!ep || !usb_endpoint_is_int_in(ep))

		goto err;

	}



	desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize);

	desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
@@ -711,12 +713,19 @@ next_desc: 


	usb_set_intfdata(intf, desc);

	rv = usb_register_dev(intf, &wdm_class);

	if (rv < 0)

		goto err3;

	else

		dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n",

			intf->minor - WDM_MINOR_BASE);

	if (rv < 0)

		goto err;

out:

	return rv;

err3:

	usb_set_intfdata(intf, NULL);

	usb_buffer_free(interface_to_usbdev(desc->intf),

			desc->bMaxPacketSize0,

			desc->inbuf,

			desc->response->transfer_dma);

err2:

	usb_buffer_free(interface_to_usbdev(desc->intf),

			desc->wMaxPacketSize,

drivers/usb/core/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ void *hcd_buffer_alloc( 
		if (size <= pool_max [i])

			return dma_pool_alloc(hcd->pool [i], mem_flags, dma);

	}

	return dma_alloc_coherent(hcd->self.controller, size, dma, 0);

	return dma_alloc_coherent(hcd->self.controller, size, dma, mem_flags);

}



void hcd_buffer_free(

drivers/usb/gadget/ci13xxx_udc.c

+4 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
 * - Gadget API (majority of optional features)

 * - Suspend & Remote Wakeup

 */

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/dmapool.h>

#include <linux/dma-mapping.h>
@@ -142,7 +143,7 @@ static struct { 
#define CAP_DEVICEADDR      (0x014UL)

#define CAP_ENDPTLISTADDR   (0x018UL)

#define CAP_PORTSC          (0x044UL)

#define CAP_DEVLC           (0x0B4UL)

#define CAP_DEVLC           (0x084UL)

#define CAP_USBMODE         (hw_bank.lpm ? 0x0C8UL : 0x068UL)

#define CAP_ENDPTSETUPSTAT  (hw_bank.lpm ? 0x0D8UL : 0x06CUL)

#define CAP_ENDPTPRIME      (hw_bank.lpm ? 0x0DCUL : 0x070UL)
@@ -1986,6 +1987,8 @@ static int ep_enable(struct usb_ep *ep, 
	do {

		dbg_event(_usb_addr(mEp), "ENABLE", 0);



		mEp->qh[mEp->dir].ptr->cap = 0;



		if (mEp->type == USB_ENDPOINT_XFER_CONTROL)

			mEp->qh[mEp->dir].ptr->cap |=  QH_IOS;

		else if (mEp->type == USB_ENDPOINT_XFER_ISOC)

drivers/usb/gadget/file_storage.c

+4 −16
Original line number Diff line number Diff line
@@ -738,7 +738,6 @@ static struct fsg_dev *the_fsg; 
static struct usb_gadget_driver		fsg_driver;



static void	close_backing_file(struct lun *curlun);

static void	close_all_backing_files(struct fsg_dev *fsg);





/*-------------------------------------------------------------------------*/
@@ -3593,12 +3592,10 @@ static int fsg_main_thread(void *fsg_) 
	fsg->thread_task = NULL;

	spin_unlock_irq(&fsg->lock);



	/* In case we are exiting because of a signal, unregister the

	 * gadget driver and close the backing file. */

	if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags)) {

	/* If we are exiting because of a signal, unregister the

	 * gadget driver. */

	if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags))

		usb_gadget_unregister_driver(&fsg_driver);

		close_all_backing_files(fsg);

	}



	/* Let the unbind and cleanup routines know the thread has exited */

	complete_and_exit(&fsg->thread_notifier, 0);
@@ -3703,14 +3700,6 @@ static void close_backing_file(struct lun *curlun) 
	}

}



static void close_all_backing_files(struct fsg_dev *fsg)

{

	int	i;



	for (i = 0; i < fsg->nluns; ++i)

		close_backing_file(&fsg->luns[i]);

}





static ssize_t show_ro(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -3845,6 +3834,7 @@ static void /* __init_or_exit */ fsg_unbind(struct usb_gadget *gadget) 
		if (curlun->registered) {

			device_remove_file(&curlun->dev, &dev_attr_ro);

			device_remove_file(&curlun->dev, &dev_attr_file);

			close_backing_file(curlun);

			device_unregister(&curlun->dev);

			curlun->registered = 0;

		}
@@ -4190,7 +4180,6 @@ autoconf_fail: 
out:

	fsg->state = FSG_STATE_TERMINATED;	// The thread is dead

	fsg_unbind(gadget);

	close_all_backing_files(fsg);

	complete(&fsg->thread_notifier);

	return rc;

}
@@ -4284,7 +4273,6 @@ static void __exit fsg_cleanup(void) 
	/* Wait for the thread to finish up */

	wait_for_completion(&fsg->thread_notifier);



	close_all_backing_files(fsg);

	kref_put(&fsg->ref, fsg_release);

}

module_exit(fsg_cleanup);