Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 180853 | Differences between
and this patch

Collapse All | Expand All

(-)sn9c1xx-1.50.orig/Kbuild (-3 lines)
Lines 33-38 Link Here
33
                sensors/sn9c102_tas5110c1b.o \
33
                sensors/sn9c102_tas5110c1b.o \
34
                sensors/sn9c102_tas5110d.o \
34
                sensors/sn9c102_tas5110d.o \
35
                sensors/sn9c102_tas5130d1b.o
35
                sensors/sn9c102_tas5130d1b.o
36
37
# Enable the /sysfs interface overriding the kernel configuration option
38
EXTRA_CFLAGS := -DCONFIG_VIDEO_ADV_DEBUG
(-)sn9c1xx-1.50.orig/sn9c102.h (-1 / +2 lines)
Lines 25-30 Link Here
25
#include <linux/usb.h>
25
#include <linux/usb.h>
26
#include <linux/videodev2.h>
26
#include <linux/videodev2.h>
27
#include <media/v4l2-common.h>
27
#include <media/v4l2-common.h>
28
#include <media/v4l2-ioctl.h>
28
#include <linux/device.h>
29
#include <linux/device.h>
29
#include <linux/list.h>
30
#include <linux/list.h>
30
#include <linux/spinlock.h>
31
#include <linux/spinlock.h>
Lines 185-191 Link Here
185
#	define V4LDBG(level, name, cmd)                                       \
186
#	define V4LDBG(level, name, cmd)                                       \
186
do {                                                                          \
187
do {                                                                          \
187
	if (debug >= (level))                                                 \
188
	if (debug >= (level))                                                 \
188
		v4l_print_ioctl(name, cmd);                                   \
189
		v4l_printk_ioctl(name, cmd);                                   \
189
} while (0)
190
} while (0)
190
#	define KDBG(level, fmt, args...)                                      \
191
#	define KDBG(level, fmt, args...)                                      \
191
do {                                                                          \
192
do {                                                                          \
(-)sn9c1xx-1.50.orig/sn9c102_core.c (-6 / +18 lines)
Lines 50-55 Link Here
50
#define SN9C102_MODULE_VERSION  "1:1.50"
50
#define SN9C102_MODULE_VERSION  "1:1.50"
51
#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 50)
51
#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 50)
52
52
53
/* 
54
https://forums.opensuse.org/showthread.php/481597-warning-kernel-3-7-1-1-breaks-fglrx-12-6-legacy-driver 
55
 */
56
#ifndef VM_RESERVED
57
#define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
58
#endif
59
53
/*****************************************************************************/
60
/*****************************************************************************/
54
61
55
MODULE_DEVICE_TABLE(usb, sn9c102_id_table);
62
MODULE_DEVICE_TABLE(usb, sn9c102_id_table);
Lines 2185-2191 Link Here
2185
2192
2186
	strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
2193
	strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
2187
	if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
2194
	if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
2188
		strlcpy(cap.bus_info, cam->usbdev->dev.bus_id,
2195
		strlcpy(cap.bus_info, dev_name(&cam->usbdev->dev),
2189
		        sizeof(cap.bus_info));
2196
		        sizeof(cap.bus_info));
2190
2197
2191
	if (copy_to_user(arg, &cap, sizeof(cap)))
2198
	if (copy_to_user(arg, &cap, sizeof(cap)))
Lines 3286-3294 Link Here
3286
	.owner = THIS_MODULE,
3293
	.owner = THIS_MODULE,
3287
	.open = sn9c102_open,
3294
	.open = sn9c102_open,
3288
	.release = sn9c102_release,
3295
	.release = sn9c102_release,
3289
	.ioctl = sn9c102_ioctl,
3296
	.unlocked_ioctl = sn9c102_ioctl,
3290
#ifdef CONFIG_COMPAT
3297
#ifdef CONFIG_COMPAT
3291
	.compat_ioctl = v4l_compat_ioctl32,
3298
	.compat_ioctl = v4l2_compat_ioctl32,
3292
#endif
3299
#endif
3293
	.read = sn9c102_read,
3300
	.read = sn9c102_read,
3294
	.poll = sn9c102_poll,
3301
	.poll = sn9c102_poll,
Lines 3386-3398 Link Here
3386
	}
3393
	}
3387
3394
3388
	strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
3395
	strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
3389
	cam->v4ldev->owner = THIS_MODULE;
3396
	cam->v4ldev->cdev->owner = THIS_MODULE;
3390
	cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
3397
#if 0 
3398
	/* hardware is neither fefined in struct video_device, struct cdev or struct device
3399
	 * and it's being initialized as 0
3400
	 * so we might just ignore it */
3391
	cam->v4ldev->hardware = 0;
3401
	cam->v4ldev->hardware = 0;
3402
#endif
3392
	cam->v4ldev->fops = &sn9c102_fops;
3403
	cam->v4ldev->fops = &sn9c102_fops;
3393
	cam->v4ldev->minor = video_nr[dev_nr];
3404
	cam->v4ldev->minor = video_nr[dev_nr];
3394
	cam->v4ldev->release = video_device_release;
3405
	cam->v4ldev->release = video_device_release;
3395
	cam->v4ldev->dev = &udev->dev;
3406
	memcpy(&cam->v4ldev->dev, &udev->dev, sizeof(struct device));
3407
	cam->v4ldev->dev.type = V4L2_CAP_VIDEO_CAPTURE ;
3396
3408
3397
	init_completion(&cam->probe);
3409
	init_completion(&cam->probe);
3398
3410

Return to bug 180853