meye driver update
PATCH 1/1 meye driver update
Hi,
The attached patch implements the needed 'release' callback in order to make videodev/sysfs happy again.
Linus, please apply.
Thanks,
Stelian.
===== drivers/media/video/meye.h 1.8 vs edited =====
drivers/media/video/meye.h +1 -1
@@ -312,7 +312,7 @@struct meye_queue grabq;/* queue for buffers to be grabbed */ -struct video_device video_dev;/* video device parameters */ +struct video_device *video_dev;/* video device parameters */ struct video_picture picture;/* video picture parameters */ struct meye_params params;/* additional parameters */ #ifdef CONFIG_PM
===== drivers/media/video/meye.c 1.18 vs edited =====
drivers/media/video/meye.c +18 -6
@@ -920,7 +920,7 @@case VIDIOCGCAP : {struct video_capability *b = arg; -strcpy (b->name,meye.video_dev.name); +strcpy (b->name,meye.video_dev->name); b->type =VID_TYPE_CAPTURE ; b->channels =1 ; b->audios =0 ;
@@ -1225,6 +1225,8 @@ .type = VID_TYPE_CAPTURE, .hardware = VID_HARDWARE_MEYE, .fops = &meye_fops, + .release = video_device_release, + .minor = -1, };#ifdef CONFIG_PM
@@ -1275,10 +1277,17 @@ goto out1; } -sonypi_camera_command (SONYPI_COMMAND_SETCAMERA ,1 ); - meye.mchip_dev = pcidev; -memcpy (&meye.video_dev, &meye_template,sizeof (meye_template)); + meye.video_dev =video_device_alloc (); +if (!meye.video_dev) { +printk (KERN_ERR "meye: video_device_alloc() failed!\n" ); + ret = -EBUSY ; + goto out1; + } +memcpy (meye.video_dev, &meye_template,sizeof (meye_template)); + meye.video_dev->dev = &meye.mchip_dev->dev; + +sonypi_camera_command (SONYPI_COMMAND_SETCAMERA ,1 );if ((ret =pci_enable_device (meye.mchip_dev))) {printk (KERN_ERR "meye: pci_enable_device failed\n" );
@@ -1335,7 +1344,7 @@wait_ms (1 );mchip_set (MCHIP_MM_INTA ,MCHIP_MM_INTA_HIC_1_MASK ); -if (video_register_device (&meye.video_dev,VFL_TYPE_GRABBER , video_nr) <0 ) { +if (video_register_device (meye.video_dev,VFL_TYPE_GRABBER , video_nr) <0 ) {printk (KERN_ERR "meye: video_register_device failed\n" ); ret = -EIO ;
@@ -1383,6 +1392,9 @@ out3:pci_disable_device (meye.mchip_dev); out2: +video_device_release (meye.video_dev); + meye.video_dev =NULL ; +sonypi_camera_command (SONYPI_COMMAND_SETCAMERA ,0 ); out1:return ret;
@@ -1390,7 +1402,7 @@ static void __devexit meye_remove(struct pci_dev *pcidev) { -video_unregister_device (&meye.video_dev); +video_unregister_device (meye.video_dev);mchip_hic_stop ();
Signature · 1 line
Stelian Pop <[email protected]>