projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 5ede4f77 AF |
1 | diff -Naur v4l-dvb-4c4fd6b8755c.org/linux/drivers/media/video/videodev.c v4l-dvb/linux/drivers/media/video/videodev.c |
| 2 | --- v4l-dvb-4c4fd6b8755c.org/linux/drivers/media/video/videodev.c 2008-05-02 12:51:27.000000000 +0200 | |
| 3 | +++ v4l-dvb/linux/drivers/media/video/videodev.c 2008-05-10 14:40:07.000000000 +0200 | |
| 4 | @@ -492,7 +492,7 @@ | |
| 5 | ||
| 6 | static struct class video_class = { | |
| 7 | .name = VIDEO_NAME, | |
| 8 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) | |
| 9 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) | |
| 10 | .release = video_release, | |
| 11 | #else | |
| 12 | .dev_attrs = video_device_attrs, | |
| 13 | @@ -2102,28 +2102,28 @@ | |
| 14 | ||
| 15 | /* sysfs class */ | |
| 16 | memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev)); | |
| 17 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) | |
| 18 | - if (vfd->dev) | |
| 19 | - vfd->class_dev.dev = vfd->dev; | |
| 20 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) | |
| 21 | +// if (vfd->dev) | |
| 22 | +// vfd->class_dev.dev = vfd->dev; | |
| 23 | #else | |
| 24 | if (vfd->dev) | |
| 25 | vfd->class_dev.parent = vfd->dev; | |
| 26 | #endif | |
| 27 | - vfd->class_dev.class = &video_class; | |
| 28 | +// vfd->class_dev.class = &video_class; | |
| 29 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) | |
| 30 | - vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); | |
| 31 | +// vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); | |
| 32 | #endif | |
| 33 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) | |
| 34 | - sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base); | |
| 35 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) | |
| 36 | +// sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base); | |
| 37 | #else | |
| 38 | sprintf(vfd->class_dev.bus_id, "%s%d", name_base, i - base); | |
| 39 | #endif | |
| 40 | - ret = device_register(&vfd->class_dev); | |
| 41 | - if (ret < 0) { | |
| 42 | - printk(KERN_ERR "%s: device_register failed\n", | |
| 43 | +// ret = device_register(&vfd->class_dev); | |
| 44 | +// if (ret < 0) { | |
| 45 | + printk(KERN_ERR "%s: device_register disabled\n", | |
| 46 | __func__); | |
| 47 | - goto fail_minor; | |
| 48 | - } | |
| 49 | +// goto fail_minor; | |
| 50 | +// } | |
| 51 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) | |
| 52 | ret = class_device_create_file(&vfd->class_dev, &class_device_attr_name); | |
| 53 | if (ret < 0) { | |
| 54 | @@ -2176,7 +2176,7 @@ | |
| 55 | panic("videodev: bad unregister"); | |
| 56 | ||
| 57 | video_device[vfd->minor]=NULL; | |
| 58 | - device_unregister(&vfd->class_dev); | |
| 59 | +// device_unregister(&vfd->class_dev); | |
| 60 | mutex_unlock(&videodev_lock); | |
| 61 | } | |
| 62 | EXPORT_SYMBOL(video_unregister_device); |