From a58be48cab84babd2ef8628aca93ca30a233dadc Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 3 Feb 2012 00:59:02 -0800 Subject: [PATCH] --- yaml --- r: 293297 b: refs/heads/master c: 83344027cacf1944fe180907fa98ee4116ef33ea h: refs/heads/master i: 293295: 76198d810dfef5fe9ed10466151d7144886bb3d6 v: v3 --- [refs] | 2 +- trunk/sound/soc/sh/fsi.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59239f644b6a..fcd99a7ed0d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fec691e73bf20e1c8e6ecd8e3725e4745bec4e21 +refs/heads/master: 83344027cacf1944fe180907fa98ee4116ef33ea diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c index 75d0cda4bad4..79a0afb78725 100644 --- a/trunk/sound/soc/sh/fsi.c +++ b/trunk/sound/soc/sh/fsi.c @@ -201,6 +201,8 @@ struct fsi_priv { }; struct fsi_stream_handler { + int (*init)(struct fsi_priv *fsi, struct fsi_stream *io); + int (*quit)(struct fsi_priv *fsi, struct fsi_stream *io); int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io); int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io); int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io); @@ -474,6 +476,7 @@ static void fsi_stream_init(struct fsi_priv *fsi, io->sample_width = samples_to_bytes(runtime, 1); io->oerr_num = -1; /* ignore 1st err */ io->uerr_num = -1; /* ignore 1st err */ + fsi_stream_handler_call(io, init, fsi, io); spin_unlock_irqrestore(&master->lock, flags); } @@ -491,6 +494,7 @@ static void fsi_stream_quit(struct fsi_priv *fsi, struct fsi_stream *io) if (io->uerr_num > 0) dev_err(dai->dev, "under_run = %d\n", io->uerr_num); + fsi_stream_handler_call(io, quit, fsi, io); io->substream = NULL; io->buff_sample_capa = 0; io->buff_sample_pos = 0;