Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / cx24123.c

diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index e18cf9e1185e435e016c2a15e5273f0fff48061e..0fe7fb11124bc6f24cd3f841556592934b432901 100644 (file)
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -1011,7 +1011,7 @@ static int cx24123_tune(struct dvb_frontend *fe,
 
 static int cx24123_get_algo(struct dvb_frontend *fe)
 {
-       return 1; /* FE_ALGO_HW */
+       return DVBFE_ALGO_HW;
 }
 
 static void cx24123_release(struct dvb_frontend *fe)