Whitespace removal from previous patch

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 99 insertions, 99 deletions

diff --git a/linux/drivers/media/video/usbvideo/Kconfig b/linux/drivers/media/video/usbvideo/Kconfig
index bb6c84d18..59fb899f3 100644
--- a/linux/drivers/media/video/usbvideo/Kconfig
+++ b/linux/drivers/media/video/usbvideo/Kconfig
@@ -43,7 +43,7 @@ config USB_QUICKCAM_MESSENGER
 	select VIDEO_USBVIDEO
 	---help---
 	  Say Y or M here to enable support for the USB Logitech Quickcam
-          Messenger webcam.
+	  Messenger webcam.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called quickcam_messenger.
diff --git a/linux/drivers/media/video/usbvideo/Makefile b/linux/drivers/media/video/usbvideo/Makefile
index b20844787..4a1b144be 100644
--- a/linux/drivers/media/video/usbvideo/Makefile
+++ b/linux/drivers/media/video/usbvideo/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_VIDEO_USBVIDEO)    += usbvideo.o
 obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o ultracam.o
 obj-$(CONFIG_USB_KONICAWC)      += konicawc.o
 obj-$(CONFIG_USB_VICAM)         += vicam.o
-obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= quickcam_messenger.o 
+obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= quickcam_messenger.o
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
index cedda9dad..8ad9f6af8 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -1,17 +1,17 @@
 /*
- * Driver for Logitech Quickcam Messenger usb video camera 
+ * Driver for Logitech Quickcam Messenger usb video camera
  * Copyright (C) Jaya Kumar
- *  
+ *
  * This work was sponsored by CIS(M) Sdn Bhd.
  * History:
  * 05/08/2006 - Jaya Kumar
- * I wrote this based on the konicawc by Simon Evans. 
+ * I wrote this based on the konicawc by Simon Evans.
  * -
  * Full credit for reverse engineering and creating an initial
  * working linux driver for the VV6422 goes to the qce-ga project by
- * Tuukka Toivonen, Jochen Hoenicke, Peter McConnell, 
+ * Tuukka Toivonen, Jochen Hoenicke, Peter McConnell,
  * Cristiano De Michele, Georg Acher, Jean-Frederic Clere as well as
- * others. 
+ * others.
  * ---
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,29 +96,29 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
 		return;
 	}
 
-	input_dev->name = "QCM button"; 
+	input_dev->name = "QCM button";
 	input_dev->phys = cam->input_physname;
 	usb_to_input_id(dev, &input_dev->id);
 	input_dev->cdev.dev = &dev->dev;
 
 	input_dev->evbit[0] = BIT(EV_KEY);
 	input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
-	
+
 	input_dev->private = cam;
-	
+
 	input_register_device(cam->input);
 }
 
-static void qcm_unregister_input(struct qcm *cam) 
+static void qcm_unregister_input(struct qcm *cam)
 {
 	if (cam->input) {
 		input_unregister_device(cam->input);
 		cam->input = NULL;
-	} 
+	}
 }
 
-static void qcm_report_buttonstat(struct qcm *cam) 
-{ 
+static void qcm_report_buttonstat(struct qcm *cam)
+{
 	if (cam->input) {
 		input_report_key(cam->input, BTN_0, cam->button_sts);
 		input_sync(cam->input);
@@ -129,17 +129,17 @@ static void qcm_int_irq(struct urb *urb, struct pt_regs *regs)
 {
 	int ret;
 	struct uvd *uvd = urb->context;
-	struct qcm *cam; 
+	struct qcm *cam;
 
 	if (!CAMERA_IS_OPERATIONAL(uvd))
 		return;
 
-	if (!uvd->streaming) 
+	if (!uvd->streaming)
 		return;
 
 	uvd->stats.urb_count++;
 
-	if (urb->status < 0) 
+	if (urb->status < 0)
 		uvd->stats.iso_err_count++;
 	else {
 		if (urb->actual_length > 0 ) {
@@ -153,14 +153,14 @@ static void qcm_int_irq(struct urb *urb, struct pt_regs *regs)
 	}
 
 	ret = usb_submit_urb(urb, GFP_ATOMIC);
-	if (ret < 0) 
+	if (ret < 0)
 		err("usb_submit_urb error (%d)", ret);
 }
 
 static int qcm_setup_input_int(struct qcm *cam, struct uvd *uvd)
 {
-	int errflag;	
-	usb_fill_int_urb(cam->button_urb, uvd->dev, 
+	int errflag;
+	usb_fill_int_urb(cam->button_urb, uvd->dev,
 			usb_rcvintpipe(uvd->dev, uvd->video_endp + 1),
 			&cam->button_sts_buf,
 			1,
@@ -179,7 +179,7 @@ static void qcm_stop_int_data(struct qcm *cam)
 }
 
 static int qcm_alloc_int_urb(struct qcm *cam)
-{	
+{
 	cam->button_urb = usb_alloc_urb(0, GFP_KERNEL);
 
 	if (!cam->button_urb)
@@ -217,7 +217,7 @@ static int qcm_stv_setw(struct usb_device *dev, u16 reg, u16 val)
 	return ret;
 }
 
-static int qcm_stv_getw(struct usb_device *dev, unsigned short reg, 
+static int qcm_stv_getw(struct usb_device *dev, unsigned short reg,
 							__le16 *val)
 {
 	int ret;
@@ -248,13 +248,13 @@ static void qcm_hsv2rgb(u16 hue, u16 sat, u16 val, u16 *r, u16 *g, u16 *b)
 	unsigned int segment, valsat;
 	signed int   h = (signed int) hue;
 	unsigned int s = (sat - 32768) * 2;	/* rescale */
-	unsigned int v = val;	
+	unsigned int v = val;
 	unsigned int p;
 
 	/*
 	the registers controling gain are 8 bit of which
 	we affect only the last 4 bits with our gain.
-	we know that if saturation is 0, (unsaturated) then 
+	we know that if saturation is 0, (unsaturated) then
 	we're grayscale (center axis of the colour cone) so
 	we set rgb=value. we use a formula obtained from
 	wikipedia to map the cone to the RGB plane. it's
@@ -271,10 +271,10 @@ static void qcm_hsv2rgb(u16 hue, u16 sat, u16 val, u16 *r, u16 *g, u16 *b)
 	the bottom side (the point) and the stuff just up
 	of that is black so we simplify those two cases.
 	*/
-	if (sat < 32768) { 
+	if (sat < 32768) {
 		/* anything less than this is unsaturated */
-		*r = val; 
-		*g = val; 
+		*r = val;
+		*g = val;
 		*b = val;
 		return;
 	}
@@ -291,7 +291,7 @@ static void qcm_hsv2rgb(u16 hue, u16 sat, u16 val, u16 *r, u16 *g, u16 *b)
 	from qc-usb-messenger code. the 10923 is 0xFFFF/6
 	to divide the cone into 6 sectors.  */
 
-	segment = (h + 10923) & 0xFFFF;		
+	segment = (h + 10923) & 0xFFFF;
 	segment = segment*3 >> 16;		/* 0..2: 0=R, 1=G, 2=B */
 	hue -= segment * 21845;			/* -10923..10923 */
 	h = hue;
@@ -339,7 +339,7 @@ static void qcm_hsv2rgb(u16 hue, u16 sat, u16 val, u16 *r, u16 *g, u16 *b)
 	}
 }
 
-static int qcm_sensor_set_gains(struct uvd *uvd, u16 hue, 
+static int qcm_sensor_set_gains(struct uvd *uvd, u16 hue,
 	u16 saturation, u16 value)
 {
 	int ret;
@@ -362,7 +362,7 @@ static int qcm_sensor_set_gains(struct uvd *uvd, u16 hue,
 	b |= 0x30;
 
 	/* set the r,g,b gain registers */
-	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x0509, r)); 
+	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x0509, r));
 	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x050A, g));
 	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x050B, b));
 
@@ -385,7 +385,7 @@ static int qcm_sensor_set_exposure(struct uvd *uvd, int exposure)
 	/* max value for formedval is 14 */
 	formedval = min(formedval, 14);
 
-	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 
+	CHECK_RET(ret, qcm_stv_setb(uvd->dev,
 			0x143A, 0xF0 | formedval));
 	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143F, 0x01));
 	return 0;
@@ -396,7 +396,7 @@ static int qcm_sensor_setlevels(struct uvd *uvd, int brightness, int contrast,
 {
 	int ret;
 	/* brightness is exposure, contrast is gain, colour is saturation */
-	CHECK_RET(ret, 
+	CHECK_RET(ret,
 		qcm_sensor_set_exposure(uvd, brightness));
 	CHECK_RET(ret, qcm_sensor_set_gains(uvd, hue, colour, contrast));
 
@@ -415,12 +415,12 @@ static int qcm_sensor_set_shutter(struct uvd *uvd, int whiteness)
 {
 	int ret;
 	/* some rescaling as done by the qc-usb-messenger code */
-	if (whiteness > 0xC000) 
+	if (whiteness > 0xC000)
 		whiteness = 0xC000 + (whiteness & 0x3FFF)*8;
-		
-	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143D, 
+
+	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143D,
 				(whiteness >> 8) & 0xFF));
-	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143E, 
+	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143E,
 				(whiteness >> 16) & 0x03));
 	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143F, 0x01));
 
@@ -434,12 +434,12 @@ static int qcm_sensor_init(struct uvd *uvd)
 	int i;
 
 	for (i=0; i < sizeof(regval_table)/sizeof(regval_table[0]) ; i++) {
-		CHECK_RET(ret, qcm_stv_setb(uvd->dev, 
-					regval_table[i].reg, 
+		CHECK_RET(ret, qcm_stv_setb(uvd->dev,
+					regval_table[i].reg,
 					regval_table[i].val));
 	}
 
-	CHECK_RET(ret, qcm_stv_setw(uvd->dev, 0x15c1, 
+	CHECK_RET(ret, qcm_stv_setw(uvd->dev, 0x15c1,
 				cpu_to_le16(ISOC_PACKET_SIZE)));
 	CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x15c3, 0x08));
 	CHECK_RET(ret, ret = qcm_stv_setb(uvd->dev, 0x143f, 0x01));
@@ -448,9 +448,9 @@ static int qcm_sensor_init(struct uvd *uvd)
 
 	CHECK_RET(ret, qcm_sensor_setsize(uvd, camera_sizes[cam->size].cmd));
 
-	CHECK_RET(ret, qcm_sensor_setlevels(uvd, uvd->vpic.brightness, 
+	CHECK_RET(ret, qcm_sensor_setlevels(uvd, uvd->vpic.brightness,
 			uvd->vpic.contrast, uvd->vpic.hue, uvd->vpic.colour));
-	
+
 	CHECK_RET(ret, qcm_sensor_set_shutter(uvd, uvd->vpic.whiteness));
 	CHECK_RET(ret, qcm_sensor_setsize(uvd, camera_sizes[cam->size].cmd));
 
@@ -474,7 +474,7 @@ static int qcm_setup_on_open(struct uvd *uvd)
 {
 	int ret;
 
-	CHECK_RET(ret, qcm_sensor_set_gains(uvd, uvd->vpic.hue, 
+	CHECK_RET(ret, qcm_sensor_set_gains(uvd, uvd->vpic.hue,
 				uvd->vpic.colour, uvd->vpic.contrast));
 	CHECK_RET(ret, qcm_sensor_set_exposure(uvd, uvd->vpic.brightness));
 	CHECK_RET(ret, qcm_sensor_set_shutter(uvd, uvd->vpic.whiteness));
@@ -494,22 +494,22 @@ static void qcm_adjust_picture(struct uvd *uvd)
 		return;
 	}
 
-	/* if there's been a change in contrast, hue, or 
-	colour then we need to recalculate hsv in order 
+	/* if there's been a change in contrast, hue, or
+	colour then we need to recalculate hsv in order
 	to update gains */
-	if ((cam->contrast != uvd->vpic.contrast) || 
+	if ((cam->contrast != uvd->vpic.contrast) ||
 		(cam->hue != uvd->vpic.hue) ||
-		(cam->colour != uvd->vpic.colour)) { 
+		(cam->colour != uvd->vpic.colour)) {
 		cam->contrast = uvd->vpic.contrast;
 		cam->hue = uvd->vpic.hue;
 		cam->colour = uvd->vpic.colour;
-		ret = qcm_sensor_set_gains(uvd, cam->hue, cam->colour, 
+		ret = qcm_sensor_set_gains(uvd, cam->hue, cam->colour,
 						cam->contrast);
 		if (ret) {
 			err("can't set gains. abandoning pic adjustment");
 			return;
 		}
-	}	
+	}
 
 	if (cam->brightness != uvd->vpic.brightness) {
 		cam->brightness = uvd->vpic.brightness;
@@ -588,7 +588,7 @@ static int qcm_compress_iso(struct uvd *uvd, struct urb *dataurb)
 			uvd->stats.iso_err_count++;
 			continue;
 		}
-		if (!n) 
+		if (!n)
 			continue;
 
 		totlen += qcm_process_frame(uvd, cdata, n);
@@ -599,7 +599,7 @@ static int qcm_compress_iso(struct uvd *uvd, struct urb *dataurb)
 static void resubmit_urb(struct uvd *uvd, struct urb *urb)
 {
 	int ret;
-	
+
 	urb->dev = uvd->dev;
 	ret = usb_submit_urb(urb, GFP_ATOMIC);
 	if (ret)
@@ -614,7 +614,7 @@ static void qcm_isoc_irq(struct urb *urb, struct pt_regs *regs)
 	if (!CAMERA_IS_OPERATIONAL(uvd))
 		return;
 
-	if (!uvd->streaming) 
+	if (!uvd->streaming)
 		return;
 
 	uvd->stats.urb_count++;
@@ -689,25 +689,25 @@ static void qcm_stop_data(struct uvd *uvd)
 	struct qcm *cam = (struct qcm *) uvd->user_data;
 	int i, j;
 	int ret;
-	
+
 	if ((uvd == NULL) || (!uvd->streaming) || (uvd->dev == NULL))
 		return;
 
 	ret = qcm_camera_off(uvd);
-	if (ret) 
+	if (ret)
 		warn("couldn't turn the cam off.");
 
 	uvd->streaming = 0;
 
 	/* Unschedule all of the iso td's */
-	for (i=0; i < USBVIDEO_NUMSBUF; i++) 
+	for (i=0; i < USBVIDEO_NUMSBUF; i++)
 		usb_kill_urb(uvd->sbuf[i].urb);
 
 	qcm_stop_int_data(cam);
 
 	if (!uvd->remove_pending) {
 		/* Set packet size to 0 */
-		j = usb_set_interface(uvd->dev, uvd->iface, 
+		j = usb_set_interface(uvd->dev, uvd->iface,
 					uvd->ifaceAltInactive);
 		if (j < 0) {
 			err("usb_set_interface() error %d.", j);
@@ -717,7 +717,7 @@ static void qcm_stop_data(struct uvd *uvd)
 }
 
 static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
-{	
+{
 	struct qcm *cam = (struct qcm *) uvd->user_data;
 	int x;
 	struct rgb *rgbL0;
@@ -736,7 +736,7 @@ static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
 		hor = 324; ver = 248; hordel = 2; verdel = 4;
 		break;
 	}
-	
+
 	if (frame->scanstate == ScanState_Scanning) {
 		while (RingQueue_GetLength(&uvd->dp) >=
 			 4 + (hor*verdel + hordel)) {
@@ -748,12 +748,12 @@ static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
 				frame->scanstate = ScanState_Lines;
 				frame->frameState = FrameState_Grabbing;
 				RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, 4);
-			/* 
-			* if we're starting, we need to discard the first 
+			/*
+			* if we're starting, we need to discard the first
 			* 4 lines of y bayer data
 			* and the first 2 gr elements of x bayer data
-			*/	
-				RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, 
+			*/
+				RING_QUEUE_DEQUEUE_BYTES(&uvd->dp,
 							(hor*verdel + hordel));
 				break;
 			}
@@ -763,13 +763,13 @@ static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
 
 	if (frame->scanstate == ScanState_Scanning)
 		return;
-	
+
 	/* now we can start processing bayer data so long as we have at least
 	* 2 lines worth of data. this is the simplest demosaicing method that
-	* I could think of. I use each 2x2 bayer element without interpolation 
-	* to generate 4 rgb pixels. 
+	* I could think of. I use each 2x2 bayer element without interpolation
+	* to generate 4 rgb pixels.
 	*/
-	while ( frame->curline < cam->height && 
+	while ( frame->curline < cam->height &&
 		(RingQueue_GetLength(&uvd->dp) >= hor*2)) {
 		/* get 2 lines of bayer for demosaicing
 		 * into 2 lines of RGB */
@@ -777,7 +777,7 @@ static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
 		bayL0 = (struct bayL0 *) cam->scratch;
 		bayL1 = (struct bayL1 *) (cam->scratch + hor);
 		/* frame->curline is the rgb y line */
-		rgbL0 = (struct rgb *) 
+		rgbL0 = (struct rgb *)
 				( frame->data + (cam->width*3*frame->curline));
 		/* w/2 because we're already doing 2 pixels */
 		rgbL1 = rgbL0 + (cam->width/2);
@@ -801,7 +801,7 @@ static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
 
 			rgbL0++;
 			rgbL1++;
-	
+
 			bayL0++;
 			bayL1++;
 		}
@@ -831,11 +831,11 @@ static int qcm_set_video_mode(struct uvd *uvd, struct video_window *vw)
 	if (x > 0 && y > 0) {
 		DEBUG(2, "trying to find size %d,%d", x, y);
 		for (newsize = 0; newsize <= MAX_FRAME_SIZE; newsize++) {
-			if ((camera_sizes[newsize].width == x) && 
+			if ((camera_sizes[newsize].width == x) &&
 				(camera_sizes[newsize].height == y))
 				break;
 		}
-	} else 
+	} else
 		newsize = cam->size;
 
 	if (newsize > MAX_FRAME_SIZE) {
@@ -851,7 +851,7 @@ static int qcm_set_video_mode(struct uvd *uvd, struct video_window *vw)
 	qcm_stop_data(uvd);
 
 	if (cam->size != newsize) {
-		oldsize = cam->size; 
+		oldsize = cam->size;
 		cam->size = newsize;
 		ret = qcm_set_camera_size(uvd);
 		if (ret) {
@@ -911,7 +911,7 @@ static int qcm_configure_video(struct uvd *uvd)
 	return 0;
 }
 
-static int qcm_probe(struct usb_interface *intf, 
+static int qcm_probe(struct usb_interface *intf,
 			const struct usb_device_id *devid)
 {
 	int err;
@@ -933,12 +933,12 @@ static int qcm_probe(struct usb_interface *intf,
 	/* first check for the video interface and not
 	* the audio interface */
 	interface = &intf->cur_altsetting[0];
-	if ((interface->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC) 
-		|| (interface->desc.bInterfaceSubClass != 
+	if ((interface->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
+		|| (interface->desc.bInterfaceSubClass !=
 			USB_CLASS_VENDOR_SPEC))
 		return -ENODEV;
 
-	/* 
+	/*
 	walk through each endpoint in each setting in the interface
 	stop when we find the one that's an isochronous IN endpoint.
 	*/
@@ -949,7 +949,7 @@ static int qcm_probe(struct usb_interface *intf,
 		for (j=0; j < interface->desc.bNumEndpoints; j++) {
 			endpoint = &interface->endpoint[j].desc;
 
-			if ((endpoint->bEndpointAddress & 
+			if ((endpoint->bEndpointAddress &
 				USB_ENDPOINT_DIR_MASK) != USB_DIR_IN)
 				continue; /* not input then not good */
 
@@ -959,8 +959,8 @@ static int qcm_probe(struct usb_interface *intf,
 				continue; /* 0 pkt size is not what we want */
 			}
 
-			if ((endpoint->bmAttributes & 
-				USB_ENDPOINT_XFERTYPE_MASK) == 
+			if ((endpoint->bmAttributes &
+				USB_ENDPOINT_XFERTYPE_MASK) ==
 				USB_ENDPOINT_XFER_ISOC) {
 				video_ep = endpoint->bEndpointAddress;
 				/* break out of the search */
@@ -972,20 +972,20 @@ static int qcm_probe(struct usb_interface *intf,
 	err("No suitable endpoint was found\n");
 	return -ENODEV;
 
-good_videoep:	
-	/* disable isochronous stream before doing anything else */ 
-	err = qcm_stv_setb(dev, STV_ISO_ENABLE, 0); 
+good_videoep:
+	/* disable isochronous stream before doing anything else */
+	err = qcm_stv_setb(dev, STV_ISO_ENABLE, 0);
 	if (err < 0) {
 		err("Failed to disable sensor stream");
 		return -EIO;
 	}
-	
+
 	/*
 	Check that this is the same unknown sensor that is known to work. This
 	sensor is suspected to be the ST VV6422C001. I'll check the same value
 	that the qc-usb driver checks. This value is probably not even the
-	sensor ID since it matches the USB dev ID. Oh well. If it doesn't 
-	match, it's probably a diff sensor so exit and apologize. 
+	sensor ID since it matches the USB dev ID. Oh well. If it doesn't
+	match, it's probably a diff sensor so exit and apologize.
 	*/
 	err = qcm_stv_getw(dev, CMOS_SENSOR_IDREV, &sensor_id);
 	if (err < 0) {
@@ -993,27 +993,27 @@ good_videoep:
 		return err;
 	}
 	if (sensor_id != cpu_to_le16(0x08F0)) {
-		err("Sensor ID %x != %x. Unsupported. Sorry\n", 
+		err("Sensor ID %x != %x. Unsupported. Sorry\n",
 			le16_to_cpu(sensor_id), (0x08F0));
 		return -ENODEV;
 	}
-	
+
 	uvd = usbvideo_AllocateDevice(cams);
-	if (!uvd) 
+	if (!uvd)
 		return -ENOMEM;
 
 	cam = (struct qcm *) uvd->user_data;
 
-	/* buf for doing demosaicing */ 
-	cam->scratch = kmalloc(324*2, GFP_KERNEL); 
+	/* buf for doing demosaicing */
+	cam->scratch = kmalloc(324*2, GFP_KERNEL);
 	if (!cam->scratch) /* uvd freed in dereg */
-		return -ENOMEM;	
+		return -ENOMEM;
 
 	/* yes, if we fail after here, cam->scratch gets freed
 	by qcm_free_uvd */
 
 	err = qcm_alloc_int_urb(cam);
-	if (err < 0) 
+	if (err < 0)
 		return err;
 
 	/* yes, if we fail after here, int urb gets freed
@@ -1042,11 +1042,11 @@ good_videoep:
 		return err;
 	}
 
-	err = usbvideo_RegisterVideoDevice(uvd);	
+	err = usbvideo_RegisterVideoDevice(uvd);
 	if (err) { /* the uvd gets freed in Deregister */
 		err("usbvideo_RegisterVideoDevice() failed.");
 		return err;
-	}	
+	}
 
 	uvd->max_frame_size = (320 * 240 * 3);
 	qcm_register_input(cam, dev);
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.h b/linux/drivers/media/video/usbvideo/quickcam_messenger.h
index a4bb397ac..baab9c081 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.h
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.h
@@ -20,7 +20,7 @@
  * - this define is taken from the qc-usb-messenger code
  */
 #define STV_ISO_ENABLE		0x1440
-#define ISOC_PACKET_SIZE	1023	
+#define ISOC_PACKET_SIZE	1023
 
 /* Chip identification number including revision indicator */
 #define CMOS_SENSOR_IDREV	0xE00A
@@ -64,9 +64,9 @@ struct cam_size {
 	u8	cmd;
 };
 
-static const struct cam_size camera_sizes[] = { 
-	{ 160, 120, 0xf }, 
-	{ 320, 240, 0x2 }, 
+static const struct cam_size camera_sizes[] = {
+	{ 160, 120, 0xf },
+	{ 320, 240, 0x2 },
 };
 
 enum frame_sizes {
@@ -101,11 +101,11 @@ struct regval {
 	u16 reg;
 	u8 val;
 };
-/* this table is derived from the 
+/* this table is derived from the
 qc-usb-messenger code */
 static const struct regval regval_table[] = {
-	{ STV_ISO_ENABLE, 0x00 },	
-	{ 0x1436, 0x00 }, { 0x1432, 0x03 },	
+	{ STV_ISO_ENABLE, 0x00 },
+	{ 0x1436, 0x00 }, { 0x1432, 0x03 },
 	{ 0x143a, 0xF9 }, { 0x0509, 0x38 },
 	{ 0x050a, 0x38 }, { 0x050b, 0x38 },
 	{ 0x050c, 0x2A }, { 0x050d, 0x01 },