git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
media
/
radio
/
radio-gemtek-pci.c
diff --git
a/drivers/media/radio/radio-gemtek-pci.c
b/drivers/media/radio/radio-gemtek-pci.c
index
630cc78
..
8e499b8
100644
(file)
--- a/
drivers/media/radio/radio-gemtek-pci.c
+++ b/
drivers/media/radio/radio-gemtek-pci.c
@@
-301,6
+301,7
@@
static struct file_operations gemtek_pci_fops = {
.open = video_exclusive_open,
.release = video_exclusive_release,
.ioctl = gemtek_pci_ioctl,
.open = video_exclusive_open,
.release = video_exclusive_release,
.ioctl = gemtek_pci_ioctl,
+ .compat_ioctl = v4l_compat_ioctl32,
.llseek = no_llseek,
};
.llseek = no_llseek,
};
@@
-317,11
+318,10
@@
static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci
struct gemtek_pci_card *card;
struct video_device *devradio;
struct gemtek_pci_card *card;
struct video_device *devradio;
- if ( (card = k
m
alloc( sizeof( struct gemtek_pci_card ), GFP_KERNEL )) == NULL ) {
+ if ( (card = k
z
alloc( sizeof( struct gemtek_pci_card ), GFP_KERNEL )) == NULL ) {
printk( KERN_ERR "gemtek_pci: out of memory\n" );
return -ENOMEM;
}
printk( KERN_ERR "gemtek_pci: out of memory\n" );
return -ENOMEM;
}
- memset( card, 0, sizeof( struct gemtek_pci_card ) );
if ( pci_enable_device( pci_dev ) )
goto err_pci;
if ( pci_enable_device( pci_dev ) )
goto err_pci;
@@
-394,7
+394,7
@@
static struct pci_driver gemtek_pci_driver =
static int __init gemtek_pci_init_module( void )
{
static int __init gemtek_pci_init_module( void )
{
- return pci_
module_init
( &gemtek_pci_driver );
+ return pci_
register_driver
( &gemtek_pci_driver );
}
static void __exit gemtek_pci_cleanup_module( void )
}
static void __exit gemtek_pci_cleanup_module( void )