V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent (84b5dbf3) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/video/cx231xx/cx231xx-audio.c

+129 −126

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ static int cx231xx_isoc_audio_deinit(struct cx231xx *dev)

		dprintk("Stopping isoc\n");


		for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
		if (dev->adev.urb[i]) {
		if (!irqs_disabled())
		@@ -145,7 +144,6 @@ static void cx231xx_audio_isocirq(struct urb *urb)
		runtime->period_size;
		period_elapsed = 1;
		}

		snd_pcm_stream_unlock(substream);
		}
		if (period_elapsed)
		@@ -191,7 +189,8 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)

		urb->dev = dev->udev;
		urb->context = dev;
		urb->pipe = usb_rcvisocpipe(dev->udev, dev->adev.end_point_addr);
		urb->pipe =
		usb_rcvisocpipe(dev->udev, dev->adev.end_point_addr);
		urb->transfer_flags = URB_ISO_ASAP;
		urb->transfer_buffer = dev->adev.transfer_buffer[i];
		urb->interval = 1;
		@@ -202,8 +201,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)
		for (j = k = 0; j < CX231XX_NUM_AUDIO_PACKETS;
		j++, k += dev->adev.max_pkt_size) {
		urb->iso_frame_desc[j].offset = k;
		urb->iso_frame_desc[j].length =
		dev->adev.max_pkt_size;
		urb->iso_frame_desc[j].length = dev->adev.max_pkt_size;
		}
		dev->adev.urb[i] = urb;
		}
		@@ -266,8 +264,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
		static struct snd_pcm_hardware snd_cx231xx_hw_capture = {
		.info = SNDRV_PCM_INFO_BLOCK_TRANSFER \|
		SNDRV_PCM_INFO_MMAP \|
		SNDRV_PCM_INFO_INTERLEAVED \|
		SNDRV_PCM_INFO_MMAP_VALID,
		SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_MMAP_VALID,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,

		@@ -330,7 +327,6 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
		int ret;
		struct cx231xx *dev = snd_pcm_substream_chip(substream);


		dprintk("closing device\n");

		/* set alternate setting for audio interface */
		@@ -402,14 +398,14 @@ static int snd_cx231xx_capture_trigger(struct snd_pcm_substream *substream,
		struct cx231xx *dev = snd_pcm_substream_chip(substream);
		int retval;


		dprintk("Should %s capture\n", (cmd == SNDRV_PCM_TRIGGER_START) ?
		"start" : "stop");

		spin_lock(&dev->adev.slock);
		switch (cmd) {
		case SNDRV_PCM_TRIGGER_START:
		cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN, CX231XX_START_AUDIO);
		cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN,
		CX231XX_START_AUDIO);
		retval = 0;
		break;
		case SNDRV_PCM_TRIGGER_STOP:
		@@ -492,7 +488,8 @@ static int cx231xx_audio_init(struct cx231xx *dev)
		return err;
		}

		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cx231xx_pcm_capture);
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
		&snd_cx231xx_pcm_capture);
		pcm->info_flags = 0;
		pcm->private_data = dev;
		strcpy(pcm->name, "Conexant cx231xx Capture");
		@@ -509,13 +506,18 @@ static int cx231xx_audio_init(struct cx231xx *dev)
		adev->udev = dev->udev;

		/* compute alternate max packet sizes for Audio */
		uif = dev->udev->actconfig->interface[dev->current_pcb_config.hs_config_info[0].interface_info.audio_index+1];
		uif =
		dev->udev->actconfig->interface[dev->current_pcb_config.
		hs_config_info[0].interface_info.
		audio_index + 1];

		adev->end_point_addr = le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress);
		adev->end_point_addr =
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
		bEndpointAddress);

		adev->num_alt = uif->num_altsetting;
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n", adev->end_point_addr,
		adev->num_alt);
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
		adev->end_point_addr, adev->num_alt);
		adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);

		if (adev->alt_max_pkt_size == NULL) {
		@@ -524,7 +526,8 @@ static int cx231xx_audio_init(struct cx231xx *dev)
		}

		for (i = 0; i < adev->num_alt; i++) {
		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		u16 tmp =
		le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		wMaxPacketSize);
		adev->alt_max_pkt_size[i] =
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

drivers/media/video/cx231xx/cx231xx-avcore.c

+2578 −1805

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/cx231xx/cx231xx-cards.c

+514 −462

Original line number	Diff line number	Diff line
		@@ -56,8 +56,6 @@ static struct cx231xx_reg_seq RDE250_XCV_TUNER[] = {
		{-1, -1, -1},
		};



		/*
		* Board definitions
		*/
		@@ -72,15 +70,20 @@ struct cx231xx_board cx231xx_boards[] = {
		.amux = CX231XX_AMUX_VIDEO,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_COMPOSITE1,
		.type =
		CX231XX_VMUX_COMPOSITE1,
		.vmux = CX231XX_VIN_2_1,
		.amux = CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_SVIDEO,
		.vmux = CX231XX_VIN_1_1 \| (CX231XX_VIN_1_2 << 8 ) \|
		.type =
		CX231XX_VMUX_SVIDEO,
		.vmux =
		CX231XX_VIN_1_1 \|
		(CX231XX_VIN_1_2 << 8) \|
		CX25840_SVIDEO_ON,
		.amux = CX231XX_AMUX_LINE_IN,
		.amux =
		CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}},
		},
		@@ -106,20 +109,28 @@ struct cx231xx_board cx231xx_boards[] = {
		.norm = V4L2_STD_PAL,

		.input = {{
		.type = CX231XX_VMUX_TELEVISION,
		.type =
		CX231XX_VMUX_TELEVISION,
		.vmux = CX231XX_VIN_3_1,
		.amux = CX231XX_AMUX_VIDEO,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_COMPOSITE1,
		.type =
		CX231XX_VMUX_COMPOSITE1,
		.vmux = CX231XX_VIN_2_1,
		.amux = CX231XX_AMUX_LINE_IN,
		.amux =
		CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_SVIDEO,
		.vmux = CX231XX_VIN_1_1 \| (CX231XX_VIN_1_2 << 8 ) \|
		.type =
		CX231XX_VMUX_SVIDEO,
		.vmux =
		CX231XX_VIN_1_1 \|
		(CX231XX_VIN_1_2 <<
		8) \|
		CX25840_SVIDEO_ON,
		.amux = CX231XX_AMUX_LINE_IN,
		.amux =
		CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}},
		},
		@@ -145,20 +156,28 @@ struct cx231xx_board cx231xx_boards[] = {
		.norm = V4L2_STD_NTSC,

		.input = {{
		.type = CX231XX_VMUX_TELEVISION,
		.type =
		CX231XX_VMUX_TELEVISION,
		.vmux = CX231XX_VIN_3_1,
		.amux = CX231XX_AMUX_VIDEO,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_COMPOSITE1,
		.type =
		CX231XX_VMUX_COMPOSITE1,
		.vmux = CX231XX_VIN_2_1,
		.amux = CX231XX_AMUX_LINE_IN,
		.amux =
		CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_SVIDEO,
		.vmux = CX231XX_VIN_1_1 \| (CX231XX_VIN_1_2 << 8 ) \|
		.type =
		CX231XX_VMUX_SVIDEO,
		.vmux =
		CX231XX_VIN_1_1 \|
		(CX231XX_VIN_1_2 <<
		8) \|
		CX25840_SVIDEO_ON,
		.amux = CX231XX_AMUX_LINE_IN,
		.amux =
		CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}},
		},
		@@ -175,6 +194,7 @@ struct usb_device_id cx231xx_id_table [] = {
		.driver_info = CX231XX_BOARD_CNXT_RDU_250},
		{},
		};

		MODULE_DEVICE_TABLE(usb, cx231xx_id_table);

		/* cx231xx_tuner_callback
		@@ -188,19 +208,24 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg)

		if (dev->tuner_type == TUNER_XC5000) {
		if (command == XC5000_TUNER_RESET) {
		cx231xx_info("Tuner Call back : RESET : command %d : tuner type %d \n",
		cx231xx_info
		("Tuner Call back : RESET : command %d : tuner type %d \n",
		command, dev->tuner_type);

		cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,1);
		cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
		1);
		msleep(10);
		cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,0);
		cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
		0);
		msleep(330);
		cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,1);
		cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
		1);
		msleep(10);
		}
		}
		return rc;
		}

		EXPORT_SYMBOL_GPL(cx231xx_tuner_callback);

		static void inline cx231xx_set_model(struct cx231xx *dev)
		@@ -267,7 +292,8 @@ static void cx231xx_config_tuner(struct cx231xx *dev)
		tun_setup.addr = dev->tuner_addr;
		tun_setup.tuner_callback = cx231xx_tuner_callback;

		cx231xx_i2c_call_clients(&dev->i2c_bus[1], TUNER_SET_TYPE_ADDR, &tun_setup);
		cx231xx_i2c_call_clients(&dev->i2c_bus[1], TUNER_SET_TYPE_ADDR,
		&tun_setup);
		#if 0
		if (tun_setup.type == TUNER_XC5000) {
		static struct xc2028_ctrl ctrl = {
		@@ -279,7 +305,8 @@ static void cx231xx_config_tuner(struct cx231xx *dev)
		.tuner = dev->tuner_type,
		.priv = &ctrl,
		};
		cx231xx_i2c_call_clients(&dev->i2c_bus[1], TUNER_SET_CONFIG, &cfg);
		cx231xx_i2c_call_clients(&dev->i2c_bus[1], TUNER_SET_CONFIG,
		&cfg);
		}
		#endif

		@@ -345,7 +372,6 @@ void cx231xx_card_setup(struct cx231xx *dev)
		"addresses)\n\n");
		}


		/* request some modules */
		if (dev->board.decoder == CX231XX_AVDECODER) {
		cx231xx_info(": Requesting cx25840 module\n");
		@@ -364,8 +390,6 @@ void cx231xx_card_setup(struct cx231xx *dev)
		#endif
		}



		/*
		* cx231xx_config()
		* inits registers with sane defaults
		@@ -418,7 +442,6 @@ void cx231xx_release_resources(struct cx231xx *dev)
		cx231xx_devused &= ~(1 << dev->devno);
		}


		/*
		* cx231xx_init_dev()
		* allocates and inits the device structs, registers i2c bus and v4l device
		@@ -530,7 +553,6 @@ static void request_module_async(struct work_struct *work)
		struct cx231xx *dev = container_of(work,
		struct cx231xx, request_module_wk);


		if (dev->has_alsa_audio)
		request_module("cx231xx-alsa");

		@@ -548,8 +570,6 @@ static void request_modules(struct cx231xx *dev)
		#define request_modules(dev)
		#endif /* CONFIG_MODULES */



		/*
		* cx231xx_usb_probe()
		* checks for supported devices
		@@ -613,15 +633,15 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		/* get maximum no.of IAD interfaces */
		assoc_desc = udev->actconfig->intf_assoc[0];
		dev->max_iad_interface_count = assoc_desc->bInterfaceCount;
		cx231xx_info(": Found IAD interface count %d\n", dev->max_iad_interface_count);
		cx231xx_info(": Found IAD interface count %d\n",
		dev->max_iad_interface_count);

		/* init CIR module TBD */

		/* store the current interface */
		lif = interface;

		}
		else if(ifnum == 1 ){
		} else if (ifnum == 1) {

		/* Get dev structure first */
		dev = usb_get_intfdata(udev->actconfig->interface[0]);
		@@ -641,14 +661,15 @@ static int cx231xx_usb_probe(struct usb_interface *interface,

		assoc_desc = udev->actconfig->intf_assoc[0];
		if (assoc_desc->bFirstInterface == ifnum) {
		cx231xx_info(": Found IAD interface match: AV Descriptor Start!! \n");
		cx231xx_info
		(": Found IAD interface match: AV Descriptor Start!! \n");
		} else {
		cx231xx_err(DRIVER_NAME " Not found matching interface\n");
		cx231xx_err(DRIVER_NAME
		" Not found matching interface\n");
		return -ENODEV;
		}

		}
		else if(ifnum >= 2) {
		} else if (ifnum >= 2) {
		/* Get dev structure first */
		dev = usb_get_intfdata(udev->actconfig->interface[0]);
		if (dev == NULL) {
		@@ -669,7 +690,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		if ((dev->interface_count - 1) != dev->max_iad_interface_count)
		skip_interface = 1; /* set skipping */
		else {
		cx231xx_info(": Found IAD interface number match with AV Device number!! \n");
		cx231xx_info
		(": Found IAD interface number match with AV Device number!! \n");
		}
		}

		@@ -705,8 +727,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		speed,
		le16_to_cpu(udev->descriptor.idVendor),
		le16_to_cpu(udev->descriptor.idProduct),
		ifnum,
		interface->altsetting->desc.bInterfaceNumber);
		ifnum, interface->altsetting->desc.bInterfaceNumber);

		/* AV device initialization */
		if ((dev->interface_count - 1) == dev->max_iad_interface_count) {
		@@ -721,14 +742,21 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		}

		/* compute alternate max packet sizes for video */
		uif = udev->actconfig->interface[dev->current_pcb_config.hs_config_info[0].interface_info.video_index+1];
		uif =
		udev->actconfig->interface[dev->current_pcb_config.
		hs_config_info[0].interface_info.
		video_index + 1];

		dev->video_mode.end_point_addr = le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress);
		dev->video_mode.end_point_addr =
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
		bEndpointAddress);

		dev->video_mode.num_alt = uif->num_altsetting;
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n", dev->video_mode.end_point_addr,
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
		dev->video_mode.end_point_addr,
		dev->video_mode.num_alt);
		dev->video_mode.alt_max_pkt_size = kmalloc(32 * dev->video_mode.num_alt, GFP_KERNEL);
		dev->video_mode.alt_max_pkt_size =
		kmalloc(32 * dev->video_mode.num_alt, GFP_KERNEL);

		if (dev->video_mode.alt_max_pkt_size == NULL) {
		cx231xx_errdev("out of memory!\n");
		@@ -738,25 +766,31 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		}

		for (i = 0; i < dev->video_mode.num_alt; i++) {
		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		wMaxPacketSize);
		u16 tmp =
		le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
		desc.wMaxPacketSize);
		dev->video_mode.alt_max_pkt_size[i] =
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
		cx231xx_info("Alternate setting %i, max size= %i\n", i,
		dev->video_mode.alt_max_pkt_size[i]);
		}


		/* compute alternate max packet sizes for vbi */
		uif = udev->actconfig->interface[dev->current_pcb_config.hs_config_info[0].interface_info.vanc_index+1];
		uif =
		udev->actconfig->interface[dev->current_pcb_config.
		hs_config_info[0].interface_info.
		vanc_index + 1];

		dev->vbi_mode.end_point_addr =
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress);
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
		bEndpointAddress);

		dev->vbi_mode.num_alt = uif->num_altsetting;
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n", dev->vbi_mode.end_point_addr,
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
		dev->vbi_mode.end_point_addr,
		dev->vbi_mode.num_alt);
		dev->vbi_mode.alt_max_pkt_size = kmalloc(32 * dev->vbi_mode.num_alt, GFP_KERNEL);
		dev->vbi_mode.alt_max_pkt_size =
		kmalloc(32 * dev->vbi_mode.num_alt, GFP_KERNEL);

		if (dev->vbi_mode.alt_max_pkt_size == NULL) {
		cx231xx_errdev("out of memory!\n");
		@@ -766,8 +800,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		}

		for (i = 0; i < dev->vbi_mode.num_alt; i++) {
		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		wMaxPacketSize);
		u16 tmp =
		le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
		desc.wMaxPacketSize);
		dev->vbi_mode.alt_max_pkt_size[i] =
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
		cx231xx_info("Alternate setting %i, max size= %i\n", i,
		@@ -775,15 +810,21 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		}

		/* compute alternate max packet sizes for sliced CC */
		uif = udev->actconfig->interface[dev->current_pcb_config.hs_config_info[0].interface_info.hanc_index+1];
		uif =
		udev->actconfig->interface[dev->current_pcb_config.
		hs_config_info[0].interface_info.
		hanc_index + 1];

		dev->sliced_cc_mode.end_point_addr =
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress);
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
		bEndpointAddress);

		dev->sliced_cc_mode.num_alt = uif->num_altsetting;
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n", dev->sliced_cc_mode.end_point_addr,
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
		dev->sliced_cc_mode.end_point_addr,
		dev->sliced_cc_mode.num_alt);
		dev->sliced_cc_mode.alt_max_pkt_size = kmalloc(32 * dev->sliced_cc_mode.num_alt, GFP_KERNEL);
		dev->sliced_cc_mode.alt_max_pkt_size =
		kmalloc(32 * dev->sliced_cc_mode.num_alt, GFP_KERNEL);

		if (dev->sliced_cc_mode.alt_max_pkt_size == NULL) {
		cx231xx_errdev("out of memory!\n");
		@@ -793,8 +834,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		}

		for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {
		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		wMaxPacketSize);
		u16 tmp =
		le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
		desc.wMaxPacketSize);
		dev->sliced_cc_mode.alt_max_pkt_size[i] =
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
		cx231xx_info("Alternate setting %i, max size= %i\n", i,
		@@ -804,15 +846,23 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		if (dev->current_pcb_config.ts1_source != 0xff) {

		/* compute alternate max packet sizes for TS1 */
		uif = udev->actconfig->interface[dev->current_pcb_config.hs_config_info[0].interface_info.ts1_index+1];
		uif =
		udev->actconfig->interface[dev->current_pcb_config.
		hs_config_info[0].
		interface_info.
		ts1_index + 1];

		dev->ts1_mode.end_point_addr =
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress);
		le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].
		desc.bEndpointAddress);

		dev->ts1_mode.num_alt = uif->num_altsetting;
		cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n", dev->ts1_mode.end_point_addr,
		cx231xx_info
		(": EndPoint Addr 0x%x, Alternate settings: %i\n",
		dev->ts1_mode.end_point_addr,
		dev->ts1_mode.num_alt);
		dev->ts1_mode.alt_max_pkt_size = kmalloc(32 * dev->ts1_mode.num_alt, GFP_KERNEL);
		dev->ts1_mode.alt_max_pkt_size =
		kmalloc(32 * dev->ts1_mode.num_alt, GFP_KERNEL);

		if (dev->ts1_mode.alt_max_pkt_size == NULL) {
		cx231xx_errdev("out of memory!\n");
		@@ -822,11 +872,15 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		}

		for (i = 0; i < dev->ts1_mode.num_alt; i++) {
		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
		u16 tmp =
		le16_to_cpu(uif->altsetting[i].
		endpoint[isoc_pipe].desc.
		wMaxPacketSize);
		dev->ts1_mode.alt_max_pkt_size[i] =
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
		cx231xx_info("Alternate setting %i, max size= %i\n", i,
		(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) +
		1);
		cx231xx_info
		("Alternate setting %i, max size= %i\n", i,
		dev->ts1_mode.alt_max_pkt_size[i]);
		}
		}
		@@ -837,8 +891,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		usb_set_intfdata(lif, dev);

		/* load other modules required */
		if((dev->interface_count -1) == dev->max_iad_interface_count )
		{
		if ((dev->interface_count - 1) == dev->max_iad_interface_count) {
		cx231xx_info("Calling request modules\n");
		request_modules(dev);
		}
		@@ -875,8 +928,7 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)
		if (dev->users) {
		cx231xx_warn
		("device /dev/video%d is open! Deregistration and memory "
		"deallocation are deferred on close.\n",
		dev->vdev->num);
		"deallocation are deferred on close.\n", dev->vdev->num);

		dev->state \|= DEV_MISCONFIGURED;
		cx231xx_uninit_isoc(dev);

drivers/media/video/cx231xx/cx231xx-conf-reg.h

+64 −68

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
		*/


		#ifndef _POLARIS_REG_H_
		#define _POLARIS_REG_H_

		@@ -75,8 +74,6 @@ typedef enum{
		#define EU_IF 0x9
		#define US_IF 0xa



		#define SUP_BLK_TUNE1 0x00
		#define SUP_BLK_TUNE2 0x01
		#define SUP_BLK_TUNE3 0x02
		@@ -487,5 +484,4 @@ typedef enum{
		/* Reserved [31:25] */
		#define FLD_DIF_CTL_IP 0x01FFFFFF


		#endif

drivers/media/video/cx231xx/cx231xx-core.c

+585 −541

File changed.

Preview size limit exceeded, changes collapsed.