Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148225
b: refs/heads/master
c: 5c556a6
h: refs/heads/master
i:
  148223: 0afa282
v: v3
  • Loading branch information
Mark Brown committed Apr 27, 2009
1 parent c0e2e35 commit 07f493c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 008db442efa542357314593c71ab9966be909855
refs/heads/master: 5c556a6e190897a0f1ff14e13722591828412031
18 changes: 12 additions & 6 deletions trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
break;

default:
dev_err(i2s->dev, "TXEN: Invalid MODE in IISMOD\n");
dev_err(i2s->dev, "TXEN: Invalid MODE %x in IISMOD\n",
mod & S3C2412_IISMOD_MODE_MASK);
break;
}

writel(con, regs + S3C2412_IISCON);
Expand All @@ -132,7 +134,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
break;

default:
dev_err(i2s->dev, "TXDIS: Invalid MODE in IISMOD\n");
dev_err(i2s->dev, "TXDIS: Invalid MODE %xin IISMOD\n",
mod & S3C2412_IISMOD_MODE_MASK);
break;
}

writel(mod, regs + S3C2412_IISMOD);
Expand Down Expand Up @@ -175,7 +179,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
break;

default:
dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n");
dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
mod & S3C2412_IISMOD_MODE_MASK);
}

writel(mod, regs + S3C2412_IISMOD);
Expand All @@ -199,7 +204,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
break;

default:
dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n");
dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
mod & S3C2412_IISMOD_MODE_MASK);
}

writel(con, regs + S3C2412_IISCON);
Expand Down Expand Up @@ -281,7 +287,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
iismod |= IISMOD_MASTER;
break;
default:
pr_debug("unknwon master/slave format\n");
pr_err("unknwon master/slave format\n");
return -EINVAL;
}

Expand All @@ -298,7 +304,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
iismod |= S3C2412_IISMOD_SDF_IIS;
break;
default:
pr_debug("Unknown data format\n");
pr_err("Unknown data format\n");
return -EINVAL;
}

Expand Down

0 comments on commit 07f493c

Please sign in to comment.