Merge tag 'gpio-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / drivers / media / dvb-frontends / cx24117.c

diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
index a6c3c9e..acb965c 100644 (file)
--- a/drivers/media/dvb-frontends/cx24117.c
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -459,7 +459,7 @@ static int cx24117_firmware_ondemand(struct dvb_frontend *fe)
        if (state->priv->skip_fw_load)
                return 0;
 
-       /* check if firmware if already running */
+       /* check if firmware is already running */
        if (cx24117_readreg(state, 0xeb) != 0xa) {
                /* Load firmware */
                /* request the firmware, this will block until loaded */