Mauro Carvalho Chehab fcb388ce6c [media] si2168: Fix a badly solved merge conflict ...

changeset a733291d6934 didn't merge the fixes well. It ended by
restoring some bad logic removed there.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

2014-07-22 20:38:13 -03:00

..

common

[media] sms: Remove CONFIG_ prefix from Kconfig symbols

2014-07-22 09:57:28 -03:00

dvb-core

[media] cxusb: TechnoTrend CT2-4400 USB DVB-T2/C tuner support

2014-07-14 21:07:07 -03:00

dvb-frontends

[media] si2168: Fix a badly solved merge conflict

2014-07-22 20:38:13 -03:00

firewire

firewire: introduce fw_driver.probe and .remove methods

2013-06-09 18:15:00 +02:00

i2c

[media] tvp5150: Use i2c_smbus_(read|write)_byte_data

2014-07-22 10:00:08 -03:00

mmc

[media] siano: get rid of CammelCase from smscoreapi.h

2013-03-21 10:03:16 -03:00

parport

[media] v4l: Support extending the v4l2_pix_format structure

2014-07-17 12:44:47 -03:00

pci

[media] solo6x10: move out of staging into drivers/media/pci.

2014-07-22 12:53:00 -03:00

platform

[media] coda: store IRAM size in struct coda_devtype

2014-07-22 12:16:58 -03:00

radio

[media] Fix 64-bit division fall-out from 64-bit control ranges

2014-07-17 12:44:38 -03:00

rc

[media] rc: add sunxi-ir driver

2014-07-04 14:53:43 -03:00

tuners

[media] tuners/Kconfig: fix build when just DTV or SDR is enabled

2014-07-22 14:24:46 -03:00

usb

[media] go7007: move out of staging into drivers/media/usb.

2014-07-22 12:53:33 -03:00

v4l2-core

[media] v4l2-mem2mem: export v4l2_m2m_try_schedule

2014-07-22 12:06:50 -03:00

Kconfig

[media] Kconfig: sub-driver auto-select SPI bus

2014-07-21 20:34:12 -03:00

Makefile

…

media-device.c

[media] media-device: Remove duplicated memset() in media_enum_entities()

2014-07-22 01:02:52 -03:00

media-devnode.c

[media] media: Use a better owner for the media device

2014-05-13 13:39:00 -03:00

media-entity.c

[media] media: Check for active links on pads with MEDIA_PAD_FL_MUST_CONNECT flag

2013-12-04 15:03:45 -02:00