dib8000: fix regression with dib807x
authorOlivier Grenie <olivier.grenie@parrot.com>
Thu, 12 Dec 2013 12:26:22 +0000 (09:26 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Feb 2014 21:50:20 +0000 (13:50 -0800)
commita844280b389a72f7436e5d8cb8ce22f5e686eff5
tree48458f9ae215c02d94e8a0d4e8362fea2b9b4fb3
parent8978b67d9929df9b28b104b64ba2bd43f7c765f8
dib8000: fix regression with dib807x

commit d67350f8c4e67f5eba627e1fd111f16257ca9c95 upstream.

Commit 173a64cb3fcf broke support for some dib807x versions.

Fix it by providing backward compatibility with the older versions.

[mkrufky@linuxtv.org: conflict handling and CodingStyle fixes]

Signed-off-by: Olivier Grenie <olivier.grenie@parrot.com>
Acked-by: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/dvb-frontends/dib8000.c