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

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

diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
index b2d9fe13e1a0fa823f414501376c5e22b7996a05..d6a8fa63040b9f77ca7af19e3caf9f345ab96098 100644 (file)
--- a/drivers/media/dvb-frontends/s921.c
+++ b/drivers/media/dvb-frontends/s921.c
@@ -466,7 +466,7 @@ static int s921_tune(struct dvb_frontend *fe,
 
 static int s921_get_algo(struct dvb_frontend *fe)
 {
-       return 1; /* FE_ALGO_HW */
+       return DVBFE_ALGO_HW;
 }
 
 static void s921_release(struct dvb_frontend *fe)