diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb-frontends/drxk_hard.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/mx2_emmaprp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 8b4c6d5f8f36..df9abe83f877 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c | |||
@@ -948,7 +948,7 @@ static int GetDeviceCapabilities(struct drxk_state *state) | |||
948 | state->m_oscClockFreq = 20250; | 948 | state->m_oscClockFreq = 20250; |
949 | break; | 949 | break; |
950 | default: | 950 | default: |
951 | printk(KERN_ERR "drxk: Clock Frequency is unkonwn\n"); | 951 | printk(KERN_ERR "drxk: Clock Frequency is unknown\n"); |
952 | return -EINVAL; | 952 | return -EINVAL; |
953 | } | 953 | } |
954 | /* | 954 | /* |
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c index 8f22ce543cf7..bfa65079fc38 100644 --- a/drivers/media/platform/mx2_emmaprp.c +++ b/drivers/media/platform/mx2_emmaprp.c | |||
@@ -371,7 +371,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data) | |||
371 | if (!curr_ctx->aborting) { | 371 | if (!curr_ctx->aborting) { |
372 | if ((irqst & PRP_INTR_ST_RDERR) || | 372 | if ((irqst & PRP_INTR_ST_RDERR) || |
373 | (irqst & PRP_INTR_ST_CH2WERR)) { | 373 | (irqst & PRP_INTR_ST_CH2WERR)) { |
374 | pr_err("PrP bus error ocurred, this transfer is probably corrupted\n"); | 374 | pr_err("PrP bus error occurred, this transfer is probably corrupted\n"); |
375 | writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); | 375 | writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); |
376 | } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ | 376 | } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ |
377 | src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); | 377 | src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); |