]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] drx-j: Avoid any regressions by preserving old behavior
authorMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 24 Jan 2014 09:31:03 +0000 (06:31 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 4 Mar 2014 17:34:53 +0000 (14:34 -0300)
The version is initialized with zero at drx_driver.c. Keep it,
in order to avoid the risk of causing any regression.

While here, remove the drx_driver.h from drxj, as this is not
required there.

Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/dvb-frontends/drx39xyj/drxj.c

index a06c45d92955534ce3b95765d3442ec0414e7008..b92ca9013f5574edbee91a0991eb63fcac621614 100644 (file)
@@ -39,7 +39,6 @@ INCLUDE FILES
 
 #include "drxj.h"
 #include "drxj_map.h"
-#include "drx_driver.h"
 
 /*============================================================================*/
 /*=== DEFINES ================================================================*/
@@ -20982,7 +20981,7 @@ static int drx_ctrl_version(struct drx_demod_instance *demod,
 {
        static char drx_driver_core_module_name[] = "Core driver";
        static char drx_driver_core_version_text[] =
-           DRX_VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+           DRX_VERSIONSTRING(0, 0, 0);
 
        static struct drx_version drx_driver_core_version;
        static struct drx_version_list drx_driver_core_version_list;
@@ -21003,9 +21002,9 @@ static int drx_ctrl_version(struct drx_demod_instance *demod,
        /* Always fill in the information of the driver SW . */
        drx_driver_core_version.module_type = DRX_MODULE_DRIVERCORE;
        drx_driver_core_version.module_name = drx_driver_core_module_name;
-       drx_driver_core_version.v_major = VERSION_MAJOR;
-       drx_driver_core_version.v_minor = VERSION_MINOR;
-       drx_driver_core_version.v_patch = VERSION_PATCH;
+       drx_driver_core_version.v_major = 0;
+       drx_driver_core_version.v_minor = 0;
+       drx_driver_core_version.v_patch = 0;
        drx_driver_core_version.v_string = drx_driver_core_version_text;
 
        drx_driver_core_version_list.version = &drx_driver_core_version;