Commit Graph

8510 Commits

Author SHA1 Message Date
Janusz Krzysztofik
d95d7b91b4 [media] V4L: omap1_camera: fix missing <linux/module.h> include
Otherwise compilation breaks with:

...

after apparently no longer included recursively from other header files.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-26 13:45:38 -02:00
Thomas Meyer
6d00c9aa2b [media] pwc: Use kmemdup rather than duplicating its implementation
The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 21:08:16 -02:00
Thomas Meyer
0ceaec188e [media] cx25821: Use kmemdup rather than duplicating its implementation
The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 21:08:01 -02:00
Thomas Meyer
82c80f8371 [media] v4l: Casting (void *) value returned by kmalloc is useless
The semantic patch that makes this change is available
in scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 21:06:57 -02:00
Andreas Oberritter
a1ed02e9f1 [media] em28xx: Add Terratec Cinergy HTC Stick
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:29:59 -02:00
Leonid V. Fedorenchik
c7855ee531 [media] cx25821.h: Line up defines
Line up constant defines to the same column.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:03:19 -02:00
Leonid V. Fedorenchik
0abfefbe49 [media] cx25821-video.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:03:07 -02:00
Leonid V. Fedorenchik
f253981406 [media] cx25821-video.c: Fix indent
Fix indent of statements to improve readability.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:02:42 -02:00
Leonid V. Fedorenchik
cd52b2cf9b [media] cx25821-video.c: Move operators
Move operator in complex expression to the end of the line to preserve
consistency.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:01:58 -02:00
Leonid V. Fedorenchik
4a33b6f8bd [media] cx25821-video.c: Fix definitions
Change multiple definitions in one statement into multiple statements
with one definition per statement.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:01:34 -02:00
Leonid V. Fedorenchik
a1937e1919 [media] cx25821-video.c: Fix assignment
Change double assignment in one statement into two assignment
statements.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:00:57 -02:00
Leonid V. Fedorenchik
1316b63ccd [media] cx25821-video.c: Change spaces
Change double spaces between lexemes into single spaces.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:00:39 -02:00
Leonid V. Fedorenchik
7e7beb8c25 [media] cx25821-video.c: Delete empty line
Delete unnecessary empty line.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 19:00:20 -02:00
Leonid V. Fedorenchik
8eb1fdfff0 [media] cx25821-video-upstream.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:59:27 -02:00
Leonid V. Fedorenchik
2c68e933a9 [media] cx25821-video-upstream.c: Fix indent
Change indent of statements to use tabs and to improve readability.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:57:37 -02:00
Leonid V. Fedorenchik
16f0fda705 [media] cx25821-video-upstream.c: Remove braces
Delete curly braces around single if-else statements.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:57:04 -02:00
Leonid V. Fedorenchik
85b7982d16 [media] cx25821-video-upstream-ch2.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:56:15 -02:00
Leonid V. Fedorenchik
df253423d4 [media] cx25821-video-upstream-ch2.c: Remove braces
Remove unnecessary curly braces around single if statement.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:54:37 -02:00
Leonid V. Fedorenchik
3a59fab41b [media] cx25821-video-upsstream-ch2.c: Move operators
Move operators in complex expressions to the end of the lines to
preserve consistency.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:54:28 -02:00
Leonid V. Fedorenchik
2a4492d822 [media] cx25821-video-upstream-ch2.c: Fix indent
Change indent of statements with (less than 8) spaces to indent with
tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:54:11 -02:00
Leonid V. Fedorenchik
3940de7482 [media] cx25821-video-upstream-ch2.c: Line up comments
Line up comments to match indent of surrounding statements.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:53:59 -02:00
Leonid V. Fedorenchik
14098bc730 [media] cx25821-medusa-video.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:53:44 -02:00
Leonid V. Fedorenchik
49faae869f [media] cx25821-medusa-video.c: Move operators
Plase operators in complex expressions at the end of the lines to
preserve consistency.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:52:58 -02:00
Leonid V. Fedorenchik
09c3544030 [media] cx25821-medusa-video.c: Fix comment
Delete part of the comment that is not checked in code.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:52:43 -02:00
Leonid V. Fedorenchik
f70a6566d3 [media] cx25821-medusa-reg.h: Line up defines
Line up constant defines to the same column. (also delete unnecessary
spaces in comments)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:52:30 -02:00
Leonid V. Fedorenchik
7618aa0e46 [media] cx25821-medusa-defines.h: Line up defines
Line up constant defines to the same column.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:52:07 -02:00
Leonid V. Fedorenchik
bc8b5dcaf5 [media] cx25821-medusa-defines.h: Fix typo
Fix typo in comment in word 'decoder'.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:51:48 -02:00
Leonid V. Fedorenchik
654d075d5d [media] cx25821-i2c.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:51:39 -02:00
Leonid V. Fedorenchik
3f0bfe5bbd [media] cx25821-core.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:51:27 -02:00
Leonid V. Fedorenchik
c14ea5e59f [media] cx25821-core.c: Fix indent
Change indent of statements that indented with spaces to indent with
tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:50:11 -02:00
Leonid V. Fedorenchik
43365d5d13 [media] cx25821-core.c: Delete empty line
Delete redundant empty line.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:49:48 -02:00
Leonid V. Fedorenchik
744992c011 [media] cx25821-cards.c: Fix indent
Fix indent of statement to use tab instead of spaces.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:49:40 -02:00
Leonid V. Fedorenchik
6f1f0e85da [media] cx25821-audio.h: Fix multiline defines
Change column of line continuation character ('\') and fix indent of
multiline defines.
Also line up remaining constant defines.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:49:25 -02:00
Leonid V. Fedorenchik
8e24958161 [media] cx25821-audio.h: Line up defines
Line up defines to the same column.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:48:53 -02:00
Leonid V. Fedorenchik
72a52fc325 [media] cx25821-audio-upstream.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:47:57 -02:00
Leonid V. Fedorenchik
64dcb19496 [media] cx25821-audio-upstream.c: Move operators
Move operator of complex expression to the end of the lines to preserve
consistency.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:35:36 -02:00
Leonid V. Fedorenchik
81f4c8dddc [media] cx25821-audio-upstream.c: Fix indent
Change wrong indent (with spaces and less than 7 columns) of statements
to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:35:06 -02:00
Leonid V. Fedorenchik
e5f1062178 [media] cx25821-alsa.c: Change line endings
Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:34:50 -02:00
Leonid V. Fedorenchik
4d9304c63e [media] cx25821-alsa.c: Fix indent
Delete unnecessary space before indented statement.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:34:08 -02:00
Leonid V. Fedorenchik
0ef8007201 [media] cx25821-alsa.c: Add braces to else clause
Add curly braces around else clause because corresponding if has them.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:33:53 -02:00
Leonid V. Fedorenchik
767f1d437d [media] cx25821-alsa.c: Line up comments
Line up comments to the same column.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 18:33:25 -02:00
Antti Palosaari
fda23faaff [media] cxd2820r: switch to .get_if_frequency()
All tuners used with cxd2820r offers IF frequency so switch that.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 17:54:04 -02:00
Paul Bolle
022568f058 [media] Fix typos in VIDEO_CX231XX_DVB Kconfig entry
Commit ede676c72d ("[...] add digital support for PV SBTVD hybrid")
added "select MEDIA_TUNER_NXP18271" to the VIDEO_CX231XX_DVB Kconfig
entry. But there's no Kconfig symbol MEDIA_TUNER_NXP18271. That should
have been MEDIA_TUNER_TDA18271. (The code added in that commit uses
tda18271_attach, which is only available if MEDIA_TUNER_TDA18271 is
set.)

The selects of MEDIA_TUNER_XC5000 and MEDIA_TUNER_TDA18271 should only
be done if MEDIA_TUNER_CUSTOMISE isn't set.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 17:35:54 -02:00
Alfredo Jesús Delaiti
8798875369 [media] cx23885: add support for Mygica X8507
This patch supports card Mygica X8507 (analog part)

This controller is a copy of driver card Mygica X8506

This patch depends on patch cx23885-alsa

To do: FM, ISDB-t, remote control, audio for composite1, S-Video and
video component.

Signed-off-by: Alfredo J. Delaiti <alfredodelaiti@netscape.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 15:51:39 -02:00
Jean Delvare
a824f0f445 [media] video: Drop undue references to i2c-algo-bit
There's one comment that has been copied from bttv to many other
media/video drivers:

/* init + register i2c algo-bit adapter */

Meanwhile, many drivers use hardware I2C implementations instead of
relying on i2c-algo-bit, so this comment is misleading. Remove the
reference to "algo-bit" from all drivers, to avoid any confusion. This
is the best way to ensure that the comments won't go out of sync
again. Anyone interested in the implementation details would rather
look at the code itself.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 15:11:17 -02:00
Mauro Carvalho Chehab
8503232f2e [media] em28xx: Fix a few warnings due to HVR-930C addition
drivers/media/video/em28xx/em28xx-cards.c:339:30: warning: ‘hauppauge_930c_gpio’ defined but not used [-Wunused-variable]
drivers/media/video/em28xx/em28xx-dvb.c: In function ‘em28xx_dvb_init’:
drivers/media/video/em28xx/em28xx-dvb.c:886:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 15:01:45 -02:00
Dan Carpenter
e469183541 [media] V4L: mt9t112: use after free in mt9t112_probe()
priv gets dereferenced in mt9t112_set_params() so we should return
before calling that.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-24 10:27:47 -02:00
Mauro Carvalho Chehab
12cbfd0a3c Merge tag 'v3.2-rc2' into staging/for_v3.3
* tag 'v3.2-rc2': (3068 commits)
  Linux 3.2-rc2
  hfs: add sanity check for file name length
  fsl-rio: fix compile error
  blackfin: Fixup export.h includes
  Blackfin: add serial TX IRQ in individual platform resource
  virtio-pci: fix use after free
  ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression)
  drm/radeon/kms/combios: fix dynamic allocation of PM clock modes
  [CPUFREQ] db8500: fix build error due to undeclared i variable
  bma023: Add SFI translation for this device
  vrtc: change its year offset from 1960 to 1972
  ce4100: fix a build error
  arm/imx: fix imx6q mmc error when mounting rootfs
  arm/imx: fix AUTO_ZRELADDR selection
  arm/imx: fix the references to ARCH_MX3
  ARM: mx51/53: set pwm clock parent to ipg_perclk
  btrfs: rename the option to nospace_cache
  drm/radeon/kms/pm: switch to dynamically allocating clock mode array
  drm/radeon/kms: optimize r600_pm_profile_init
  drm/radeon/kms/pm: add a proper pm profile init function for fusion
  ...

Conflicts:
	drivers/media/radio/Kconfig
2011-11-23 19:42:09 -02:00
Mauro Carvalho Chehab
dfbbf5da6c [media] em28xx: Add IR support for HVR-930C
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-20 12:55:15 -02:00
Mauro Carvalho Chehab
20ae9742eb [media] em28xx: Add IR support for em2884
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-11-20 12:55:10 -02:00