Michael Krufky [Tue, 1 Jul 2008 07:35:26 +0000 (04:35 -0300)]
V4L/DVB (8311): sms1xxx: support device-specific firmware filenames on stellar usb1 sticks
Add the capability to define device-specific firmware filenames for the SMS1010,
with a mechanism to fall back to the generic firmware if the device-specific
firmware is not present.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 29 Jun 2008 18:15:19 +0000 (15:15 -0300)]
V4L/DVB (8310): sms1xxx: remove kmutex_t typedef
remove typedef struct mutex kmutex_t
fix one line > 80 columns
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 29 Jun 2008 17:45:37 +0000 (14:45 -0300)]
V4L/DVB (8309): sms1xxx: fix OOPS on 64 bit kernels due to a bad cast
Fix the following build warning:
smscoreapi.c: In function 'smscore_detect_mode':
smscoreapi.c:689: warning: cast from pointer to integer of different size
smscoreapi.c:689: warning: cast to pointer from integer of different size
smscoreapi.c: In function 'smscore_set_device_mode':
smscoreapi.c:820: warning: cast from pointer to integer of different size
smscoreapi.c:820: warning: cast to pointer from integer of different size
...and fix the following OOPS on 64bit kernels:
[ 717.263667] usb 6-4: new high speed USB device using ehci_hcd and address 2
[ 717.396386] usb 6-4: configuration #1 chosen from 1 choice
[ 717.473650] Unable to handle kernel paging request at
0000000000c02000 RIP:
[ 717.473657] [<
ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0
[ 717.473669] PGD
3c6f7067 PUD
3d484067 PMD 0
[ 717.473674] Oops: 0002 [1] SMP
[ 717.473678] CPU 0
[Modules linked in snipped]
[ 717.473773] Pid: 8380, comm: modprobe Tainted: P 2.6.24-16-generic #1
[ 717.473776] RIP: 0010:[<
ffffffff88db9edc>] [<
ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0
[ 717.473784] RSP: 0018:
ffff81003d495ba8 EFLAGS:
00010206
[ 717.473786] RAX:
ffff81003d8cd8d0 RBX:
ffff81003d8cd800 RCX:
ffff81003d8cd8d0
[ 717.473788] RDX:
0000000000000008 RSI:
ffff81003f080070 RDI:
ffff81003d8cd800
[ 717.473791] RBP:
0000000000000004 R08:
ffff81003ec0104b R09:
ffffffffffffffff
[ 717.473793] R10:
0000000000000000 R11:
0000000000000000 R12:
0000000000c02000
[ 717.473796] R13:
00000000fffffff4 R14:
ffff810000c02000 R15:
ffff81003d8cd878
[ 717.473799] FS:
00007f70a680f6e0(0000) GS:
ffffffff805b0000(0000) knlGS:
0000000000000000
[ 717.473801] CS: 0010 DS: 0000 ES: 0000 CR0:
000000008005003b
[ 717.473804] CR2:
0000000000c02000 CR3:
000000003c68b000 CR4:
00000000000006e0
[ 717.473806] DR0:
0000000000000000 DR1:
0000000000000000 DR2:
0000000000000000
[ 717.473809] DR3:
0000000000000000 DR6:
00000000ffff0ff0 DR7:
0000000000000400
[ 717.473812] Process modprobe (pid: 8380, threadinfo
ffff81003d494000, task
ffff81003d2fc000)
[ 717.473814] Stack:
ffff81003d8cd800 ffff81003d8cd800 0000000000000000 ffff81003c6d8000
[ 717.473820]
ffff81003dcac800 0000000000000008 ffffc20000787bb0 ffffffff88dba16c
[ 717.473825]
ffff81003dcac800 000000000000000a 0000000000000000 ffffffff88dbb2fa
[ 717.473829] Call Trace:
[ 717.473866] [<
ffffffff88dba16c>] :sms1xxx:smscore_start_device+0x1c/0xb0
[ 717.473885] [<
ffffffff88dbb2fa>] :sms1xxx:smsusb_probe+0x29a/0x670
[ 717.473929] [<
ffffffff88dbaca0>] :sms1xxx:smsusb_sendrequest+0x0/0x30
[ 717.473965] [<
ffffffff804614d9>] mutex_lock+0x9/0x20
[ 717.473998] [<
ffffffff8806c42e>] :usbcore:usb_autopm_do_device+0x8e/0x130
[ 717.474040] [<
ffffffff8806d33a>] :usbcore:usb_probe_interface+0xda/0x160
[ 717.474067] [<
ffffffff803b9f4c>] driver_probe_device+0x9c/0x1b0
[ 717.474091] [<
ffffffff803ba219>] __driver_attach+0xc9/0xd0
[ 717.474107] [<
ffffffff803ba150>] __driver_attach+0x0/0xd0
[ 717.474115] [<
ffffffff803b918d>] bus_for_each_dev+0x4d/0x80
[ 717.474156] [<
ffffffff803b959c>] bus_add_driver+0xac/0x220
[ 717.474203] [<
ffffffff8806cde9>] :usbcore:usb_register_driver+0xa9/0x120
[ 717.474232] [<
ffffffff88dbb00b>] :sms1xxx:smsusb_register+0x1b/0x70
[ 717.474243] [<
ffffffff88dba50c>] :sms1xxx:smscore_module_init+0x7c/0xb0
[ 717.474253] [<
ffffffff80263b6e>] sys_init_module+0x18e/0x1a90
[ 717.474426] [<
ffffffff8020c37e>] system_call+0x7e/0x83
[ 717.474490]
[ 717.474491]
[ 717.474492] Code: 66 41 c7 04 24 9c 02 41 c6 44 24 02 00 4c 89 e6 41 c6 44 24
[ 717.474506] RIP [<
ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0
[ 717.474513] RSP <
ffff81003d495ba8>
[ 717.474515] CR2:
0000000000c02000
[ 717.474521] ---[ end trace
52d9c6f207be106a ]---
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 29 Jun 2008 02:53:51 +0000 (23:53 -0300)]
V4L/DVB (8308): sms1xxx: Provide option to support Siano default usb ids
Provide an option to enable / disable support for Siano's default usb ids.
This allows the support for Siano's USB IDs to be disabled, so that Siano's
external driver can be used, instead.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 29 Jun 2008 04:33:23 +0000 (01:33 -0300)]
V4L/DVB (8307): sms1xxx: change smsusb_driver.name to sms1xxx
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 29 Jun 2008 02:27:19 +0000 (23:27 -0300)]
V4L/DVB (8306): sms1xxx: log firmware download process by default
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 28 Jun 2008 23:53:45 +0000 (20:53 -0300)]
V4L/DVB (8305): sms1xxx: fix warning: format '%d' expects type 'int', but argument x has type 'size_t'
Fix the following 64bit build warning:
make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic'
CC [M] smscoreapi.o
smscoreapi.c: In function 'smscore_load_firmware_from_file':
smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
CC [M] smsusb.o
smsusb.c: In function 'smsusb1_load_firmware':
smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 28 Jun 2008 20:09:28 +0000 (17:09 -0300)]
V4L/DVB (8303): sms1xxx: update MODULE_DESCRIPTION
set MODULE_DESCRIPTION to "Driver for the Siano SMS1XXX USB dongle"
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 28 Jun 2008 19:45:36 +0000 (16:45 -0300)]
V4L/DVB (8302): sms1xxx: fix Siano board names
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 26 Jun 2008 07:58:30 +0000 (04:58 -0300)]
V4L/DVB (8301): sms1xxx: add capability to define device-specific firmware filenames
Add the capability to define device-specific firmware filenames for the SMS1150,
with a mechanism to fall back to the generic firmware if the device-specific
firmware is not present.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 21 Jun 2008 08:24:38 +0000 (05:24 -0300)]
V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 21 Jun 2008 05:44:02 +0000 (02:44 -0300)]
V4L/DVB (8299): sms1xxx: mark functions static
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Fri, 20 Jun 2008 01:20:49 +0000 (22:20 -0300)]
V4L/DVB (8298): sms1xxx: remove redundant __func__ in sms_err macro
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Fri, 20 Jun 2008 01:15:38 +0000 (22:15 -0300)]
V4L/DVB (8297): sms1xxx: remove old printk macros
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Fri, 20 Jun 2008 01:07:23 +0000 (22:07 -0300)]
V4L/DVB (8296): sms1xxx: always show error messages
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 19 Jun 2008 23:59:08 +0000 (20:59 -0300)]
V4L/DVB (8295): sms1xxx: add debug module option, to enable debug messages
All dmesg spam turned off by default, for now. Values for debug:
(info=1, adv=2 (or-able)
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 19 Jun 2008 23:35:21 +0000 (20:35 -0300)]
V4L/DVB (8294): sms1xxx: move message formatting into printk macros
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 19 Jun 2008 04:15:46 +0000 (01:15 -0300)]
V4L/DVB (8293): sms1xxx: create printk macros
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 19 Jun 2008 01:09:55 +0000 (22:09 -0300)]
V4L/DVB (8292): sms1xxx: add code to allow device-specific functionality
Set board ID in the usb_device_id table's driver_info field.
Use board name when registering the dvb adapter.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Wed, 18 Jun 2008 23:25:25 +0000 (20:25 -0300)]
V4L/DVB (8291): sms1xxx: change default_mode to 4
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 16 Jun 2008 15:37:05 +0000 (12:37 -0300)]
V4L/DVB (8290): sms1xxx: small cleanup
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 22:39:55 +0000 (19:39 -0300)]
V4L/DVB (8289): sms1xxx: remove #if LINUX_VERSION_CODE checks
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 22:27:35 +0000 (19:27 -0300)]
V4L/DVB (8288): sms1xxx: more cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 22:11:37 +0000 (19:11 -0300)]
V4L/DVB (8287): sms1xxx: fix WARNING: unnecessary cast may hide bugs
fix the following checkpatch.pl warning:
WARNING: unnecessary cast may hide bugs,
see http://c-faq.com/malloc/mallocnocast.html
596: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:540:
+ msg = (struct SmsMsgHdr_ST *) kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 20:52:24 +0000 (17:52 -0300)]
V4L/DVB (8286): sms1xxx: remove typedefs
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 20:36:00 +0000 (17:36 -0300)]
V4L/DVB (8285): sms1xxx: more 80-column cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 20:26:42 +0000 (17:26 -0300)]
V4L/DVB (8284): sms1xxx: fix WARNING: printk() should include KERN_ facility level
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 19:50:11 +0000 (16:50 -0300)]
V4L/DVB (8283): sms1xxx: 80-column cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 18:52:43 +0000 (15:52 -0300)]
V4L/DVB (8282): sms1xxx: more codingstyle cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 18:32:00 +0000 (15:32 -0300)]
V4L/DVB (8281): sms1xxx: remove INT / UINT typedefs
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sun, 15 Jun 2008 18:14:13 +0000 (15:14 -0300)]
V4L/DVB (8280): sms1xxx: more codingstyle cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 14 Jun 2008 21:27:18 +0000 (18:27 -0300)]
V4L/DVB (8279): sms1xxx: #define usb vid:pid's
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 14 Jun 2008 10:40:41 +0000 (07:40 -0300)]
V4L/DVB (8278): sms1xxx: more codingstyle cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Sat, 14 Jun 2008 03:43:26 +0000 (00:43 -0300)]
V4L/DVB (8277): sms1xxx: update latest siano drop to 1.2.17
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 6 May 2008 06:52:44 +0000 (03:52 -0300)]
V4L/DVB (8276): sms1xxx: codingstyle cleanup: "(foo*)" should be "(foo *)"
ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 6 May 2008 06:11:51 +0000 (03:11 -0300)]
V4L/DVB (8275): sms1xxx: codingstyle cleanup: "foo* bar"/"foo * bar" should be "foo *bar"
ERROR: "foo* bar" should be "foo *bar"
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 22 May 2008 21:32:40 +0000 (18:32 -0300)]
V4L/DVB (8274): sms1xxx: build cleanup after driver relocation
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 22 May 2008 21:30:17 +0000 (18:30 -0300)]
V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 22 May 2008 21:29:20 +0000 (18:29 -0300)]
V4L/DVB (8272): sms1xxx: move driver from media/mdtv/ to media/dvb/siano/
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 21:07:39 +0000 (18:07 -0300)]
V4L/DVB (8271): sms1xxx: usbvid table
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 21:06:41 +0000 (18:06 -0300)]
V4L/DVB (8270): sms1xxx: header include cleanups and unexport symbols
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 21:05:26 +0000 (18:05 -0300)]
V4L/DVB (8269): sms1xxx: copyrights
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 21:04:36 +0000 (18:04 -0300)]
V4L/DVB (8268): sms1xxx: usb cleanup
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 21:01:42 +0000 (18:01 -0300)]
V4L/DVB (8267): sms1xxx: Makefile cleanup
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 21:01:02 +0000 (18:01 -0300)]
V4L/DVB (8266): sms1xxx: merge modules
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 19:43:04 +0000 (16:43 -0300)]
V4L/DVB (8265): sms1xxx: Kconfig / Makefile cleanups
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 18:48:54 +0000 (15:48 -0300)]
V4L/DVB (8264): sms1xxx: remove smstypes.h
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Thu, 22 May 2008 18:46:32 +0000 (15:46 -0300)]
V4L/DVB (8263): sms1xxx: merge ksyms
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Mon, 19 May 2008 22:09:21 +0000 (19:09 -0300)]
V4L/DVB (8262): sms1xxx: remove smschar.o
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Mon, 19 May 2008 22:01:25 +0000 (19:01 -0300)]
V4L/DVB (8261): sms1xxx: remove smsnet.o
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 19 May 2008 21:58:40 +0000 (18:58 -0300)]
V4L/DVB (8260): sms1xxx: build fixes
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 19 May 2008 21:57:12 +0000 (18:57 -0300)]
V4L/DVB (8259): sms1xxx: pass adapter_nr into dvb_register_adapter
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 19 May 2008 21:56:13 +0000 (18:56 -0300)]
V4L/DVB (8258): add support for SMS1010 and SMS1150 based digital television devices
initial driver drop, provided by Siano Mobile Silicon, Inc.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Fri, 11 Jul 2008 22:32:15 +0000 (19:32 -0300)]
V4L/DVB (8257): uvcvideo: Fix possible AB-BA deadlock with videodev_lock and open_mutex
The uvcvideo driver's uvc_v4l2_open() method is called from videodev's
video_open() function, which means it is called with the videodev_lock
mutex held. uvc_v4l2_open() then takes uvc_driver.open_mutex to check
dev->state and avoid racing against a device disconnect, which means
that open_mutex must nest inside videodev_lock.
However uvc_disconnect() takes the open_mutex around setting
dev->state and also around putting its device reference. However, if
uvc_disconnect() ends up dropping the last reference, it will call
uvc_delete(), which calls into the videodev code to unregister its
device, and this will end up taking videodev_lock. This opens a
(unlikely in practice) window for an AB-BA deadlock and also causes a
lockdep warning because of the lock misordering.
Fortunately there is no apparent reason to hold open_mutex when doing
kref_put() in uvc_disconnect(): if uvc_v4l2_open() runs before the
state is set to UVC_DEV_DISCONNECTED, then it will take another
reference to the device and kref_put() won't call uvc_delete; if
uvc_v4l2_open() runs after the state is set, it will run before
uvc_delete(), see the state, and return immediately -- uvc_delete()
does uvc_unregister_video() (and hence video_unregister_device(),
which is synchronized with videodev_lock) as its first thing, so there
is no risk of use-after-free in uvc_v4l2_open().
Bug diagnosed based on a lockdep warning reported by Romano Giannetti
<romano@dea.icai.upcomillas.es>.
Signed-off-by: Roland Dreier <roland@digitalvampire.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew Morton [Fri, 4 Jul 2008 09:33:23 +0000 (06:33 -0300)]
V4L/DVB (8256): uvc/uvc_v4l2.c: suppress uninitialized var warning
drivers/media/video/uvc/uvc_v4l2.c: In function `uvc_v4l2_mmap':
drivers/media/video/uvc/uvc_v4l2.c:1035: warning: 'buffer' might be used uninitialized in this function
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Wed, 9 Jul 2008 21:29:59 +0000 (18:29 -0300)]
V4L/DVB (8254): uvcvideo : Add support for Asus F9GS integrated webcam
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Wed, 9 Jul 2008 08:26:26 +0000 (05:26 -0300)]
V4L/DVB (8253): gspca: fix warnings on x86_64
/home/v4l/master/v4l/gspca.c: In function 'gspca_frame_add':
/home/v4l/master/v4l/gspca.c:222: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
/home/v4l/master/v4l/gspca.c: In function 'dev_read':
/home/v4l/master/v4l/gspca.c:1568: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
/home/v4l/master/v4l/gspca.c:1618: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
Acked-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Christophe Jaillet [Fri, 4 Jul 2008 09:33:22 +0000 (06:33 -0300)]
V4L/DVB (8252): buf-dma-sg.c: avoid clearing memory twice
1) Remove a useless initialisation of 'i'
2) Avoid clearing the memory allocated twice (once in 'kcalloc', once
in 'sg_init_table')
3) Remove a test that can never trigger. The function returns NULL in
such a case, so we know that at this point 'pages[0]' != NULL
Signed-off-by: Christophe Jaillet <jaillet.christophe@wanadoo.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Akinobu Mita [Fri, 4 Jul 2008 09:33:20 +0000 (06:33 -0300)]
V4L/DVB (8251): ttusb: use simple_read_from_buffer()()
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
David Howells [Tue, 8 Jul 2008 19:04:38 +0000 (16:04 -0300)]
V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver
Fix casts of pointers to integers of different sizes in the ivtv framebuffer
driver.
These were introduced in patch
38eb6ba5b8487d15b020fe391d324edd2b659b03.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean Delvare [Thu, 10 Jul 2008 14:23:37 +0000 (11:23 -0300)]
V4L/DVB (8246): tvaudio: Stop I2C driver ID abuse
The tvaudio driver is using "official" I2C device IDs for internal
purpose. There must be some historical reason behind this but anyway,
it shouldn't do that. As the stored values are never used, the easiest
way to fix the problem is simply to remove them altogether.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean Delvare [Thu, 10 Jul 2008 14:04:10 +0000 (11:04 -0300)]
V4L/DVB (8245): ovcamchip: Delete stray I2C bus ID
I2C_HW_SMBUS_OVFX2 is referenced in ovcamchip_core.c, but no bus uses
this driver ID, so we can remove the reference. As far as I can see,
the Cypress FX2 webcam is handled by a different driver (dvb-usb).
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Massimo Piccioni [Fri, 11 Jul 2008 16:48:02 +0000 (13:48 -0300)]
V4L/DVB (8244): saa7134: add support for AVerMedia M103
The following patch updates saa7134 driver to add support for AVerMedia
M103 MiniPCI DVB-T Hybrid card.
Signed-off-by: Massimo Piccioni <alsa@piccio.org>
[mchehab@infradead.org: fixed merge conflicts and a small codingstyle]
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Wed, 9 Jul 2008 05:18:49 +0000 (02:18 -0300)]
V4L/DVB (8236): cx23885: add support for new revision of FusionHDTV7 Dual Express
The new revision of this board uses the same pci subsystem id as the first
revision, but uses a S5H1411 demodulator instead of the S5H1409.
In the case of the FusionHDTV7 Dual Express,
if s5h1409_attach fails, try s5h1411_attach.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Tue, 8 Jul 2008 02:41:40 +0000 (23:41 -0300)]
V4L/DVB (8235): uvcvideo : Add support for Medion Akoya Mini E1210 integrated webcam
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Tue, 8 Jul 2008 02:04:29 +0000 (23:04 -0300)]
V4L/DVB (8234): uvcvideo: Make input device support optional
UVC devices can report button events. The uvcvideo driver depends on
CONFIG_INPUT to report events to the input layer. This patch removes the hard
dependency by introducing a new CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV option.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Tue, 8 Jul 2008 09:58:15 +0000 (06:58 -0300)]
V4L/DVB (8232): gspca: Change the USERPTR mechanism.
main: Change the packet copy mechanism for userptr.
Cannot do reqbufs ioctl when already done and count != 0.
Accept count < frame size in read().
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Mon, 7 Jul 2008 11:31:16 +0000 (08:31 -0300)]
V4L/DVB (8231): gspca: Do not declare the webcams declared by other drivers.
etoms: Do not declare the webcams declared by the driver et61x251.
sonixb, sonixj:
Do not declare the webcams declared by the driver sn9c102.
zc3xx: Do not declare the webcams declared by the driver zc0301.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Fri, 18 Jul 2008 03:50:58 +0000 (00:50 -0300)]
v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
Also remove some blank lines that were used to split compat code at -devel
tree.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Fri, 4 Jul 2008 03:36:21 +0000 (00:36 -0300)]
V4L/DVB (8209): uvcvideo: Don't free URB buffers on suspend.
All submitted URBs must be killed at suspend time, but URB buffers don't have
to be freed. Avoiding a free on suspend/reallocate on resume lowers the presure
on system memory.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Fri, 4 Jul 2008 03:35:26 +0000 (00:35 -0300)]
V4L/DVB (8208): uvcvideo: Use GFP_NOIO when allocating memory during resume
The swap device might still be asleep, so memory allocated in the resume
handler must use GFP_NOIO. Thanks to Oliver Neukum for catching and reporting
this bug.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Fri, 4 Jul 2008 03:34:59 +0000 (00:34 -0300)]
V4L/DVB (8207): uvcvideo: Fix a buffer overflow in format descriptor parsing
Thanks to Oliver Neukum for catching and reporting this bug.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andoni Zubimendi [Sun, 6 Jul 2008 10:27:19 +0000 (07:27 -0300)]
V4L/DVB (8205): gspca: Size of frame header adjusted according to sn9c10x in sonixb.
Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Sun, 6 Jul 2008 10:04:39 +0000 (07:04 -0300)]
V4L/DVB (8204): gspca: Cleanup code.
spca508: Cleanup code.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Sun, 6 Jul 2008 09:40:55 +0000 (06:40 -0300)]
V4L/DVB (8202): gspca: PAC207 frames may be not compressed.
pac207: Set the sizeimage to the max value for 352x288.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Sat, 5 Jul 2008 14:49:20 +0000 (11:49 -0300)]
V4L/DVB (8201): gspca: v4l2_pix_format in each subdriver.
main: Parameter comp_fac removed.
main, pac207:
get_buff_size op removed.
(all) v4l2_pix_format in each subdriver.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Harvey Harrison [Sat, 5 Jul 2008 09:12:47 +0000 (06:12 -0300)]
V4L/DVB (8199): gspca: Compile warnings about NULL ptr.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Fri, 4 Jul 2008 21:39:08 +0000 (18:39 -0300)]
V4L/DVB (8198): gspca: Frame decoding errors when PAC207 in full daylight.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Fri, 4 Jul 2008 21:29:32 +0000 (18:29 -0300)]
V4L/DVB (8197): gspca: pac207 frames no more decoded in the subdriver.
videodev2: New pixfmt
pac207: Remove the specific decoding.
main: get_buff_size operation added for the subdriver.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Fri, 4 Jul 2008 20:55:18 +0000 (17:55 -0300)]
V4L/DVB (8196): gspca: Correct sizeimage in vidioc_s/try/g_fmt_cap
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Fri, 4 Jul 2008 14:16:16 +0000 (11:16 -0300)]
V4L/DVB (8195): gspca: Input buffer overwritten in spca561 + cleanup code.
spca561: Input buffer may be changed on reg write.
(all sd): Cleanup code, 'const' added.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Thu, 3 Jul 2008 14:20:58 +0000 (11:20 -0300)]
V4L/DVB (8194): gspca: Fix the format of the low resolution mode of spca561.
The low (half) res modes of the spca561 are not spca561 compressed, but are
raw bayer, this patches fixes this and adds a PIX_FMT define for the GBRG
bayer format used by the spca561 in low res mode.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Thu, 3 Jul 2008 14:09:12 +0000 (11:09 -0300)]
V4L/DVB (8193): gspca: Input buffer may be changed on reg write.
Done for conex, etoms, pac7311, sonixj, t613 and tv8532.
Code cleanup for some other subdrivers.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Thu, 3 Jul 2008 11:15:22 +0000 (08:15 -0300)]
V4L/DVB (8192): Try to fix a reg_w() bug
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans de Goede [Thu, 3 Jul 2008 09:48:22 +0000 (06:48 -0300)]
V4L/DVB (8191): gspca: Make CONFIG_VIDEO_ADV_DEBUG actually work.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andy Walls [Mon, 7 Jul 2008 13:36:16 +0000 (10:36 -0300)]
V4L/DVB (8189): cx18: Use correct GPIO pin for resetting Xceive 3028 tuner on Yuan MPC718
Change the Yuan MPC718 cards entry to use the correct GPIO pin for resetting
the Xceive 3028 tuner. Thanks to Brian Hope <brian@hopefamily.info> for
taking the time and figuring out which pin to use.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andy Walls [Sun, 6 Jul 2008 22:36:52 +0000 (19:36 -0300)]
V4L/DVB (8188): cx18: Add missing reset recovery delay in cx18-i2c.c
cx18: Add a missing reset recovery delay in cx18-i2c.c after
the final deassert.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Fri, 4 Jul 2008 02:43:36 +0000 (23:43 -0300)]
V4L/DVB (8186): dib0700: add support for Hauppauge Nova-TD Stick 52009
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Douglas Schilling Landgraf [Fri, 4 Jul 2008 07:40:28 +0000 (04:40 -0300)]
V4L/DVB (8184): spca508: Add Clone Digital Webcam 11043
Added ID vendor/product for Clone Digital Webcam 11043.
Thanks to Ivan Brasil Fuzzer <ivan@fuzzer.com.br> for testing and data collection.
Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Wed, 2 Jul 2008 15:55:49 +0000 (12:55 -0300)]
V4L/DVB (8183): cxusb: select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
After adding support for AVerTVHD Volar, DVB_USB_CXUSB must
select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Wed, 2 Jul 2008 12:14:56 +0000 (09:14 -0300)]
V4L/DVB (8181): gspca: read() did not work (loop in kernel, timeout...)
main: Remove some vidioc_xx traces.
main: read() did not work (user irq instead of mmap irq).
main: Lack of v4l1 compat.
main: Process loop inside kernel when no frame arriving.
main: Double qbuf in read() when too many buffered frames.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Jean-Francois Moine [Tue, 1 Jul 2008 13:03:42 +0000 (10:03 -0300)]
V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG.
main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505:
Cleanup source.
sunplus: Compilation error when VIDEO_ADV_DEBUG set.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Mon, 30 Jun 2008 06:35:52 +0000 (03:35 -0300)]
V4L/DVB (8176): pvrusb2: Update video_gop_size
When switching video standard, ensure that video GOP size remains
appropriately configured.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Mon, 30 Jun 2008 06:32:35 +0000 (03:32 -0300)]
V4L/DVB (8175): pvrusb2: Fix misleading source code comment
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Tue, 1 Jul 2008 21:46:09 +0000 (18:46 -0300)]
V4L/DVB (8173): saa711x.c: remove obsolete file.
saa711x.c is no longer used. Remove.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Mon, 30 Jun 2008 23:02:47 +0000 (20:02 -0300)]
V4L/DVB (8171): ivtv: put back full device name, people relied on it in udev rules.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sat, 28 Jun 2008 23:57:56 +0000 (20:57 -0300)]
V4L/DVB (8169): cx18: enable TS support
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sat, 28 Jun 2008 23:57:30 +0000 (20:57 -0300)]
V4L/DVB (8168): cx18: Upgrade to newer firmware & update cx18 documentation.
Conexant graciously gave us permission to redistribute the
firmware. Update the documentation where the firmware can be
downloaded.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sat, 28 Jun 2008 17:57:30 +0000 (14:57 -0300)]
V4L/DVB (8168a): cx18: Update cx18 documentation.
Update the documentation, providing an updated list of supported boards.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sat, 28 Jun 2008 15:49:20 +0000 (12:49 -0300)]
V4L/DVB (8167): cx18: set correct audio inputs for tuner and line-in 2.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
projects / platform / kernel / linux-rpi.git / log