diff options
Diffstat (limited to 'sound/soc/sh/fsi.c')
-rw-r--r-- | sound/soc/sh/fsi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index f830c41f97dd..30390260bb67 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -276,7 +276,7 @@ struct fsi_stream_handler { | |||
276 | int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev); | 276 | int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev); |
277 | int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io); | 277 | int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io); |
278 | int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io); | 278 | int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io); |
279 | void (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io, | 279 | int (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io, |
280 | int enable); | 280 | int enable); |
281 | }; | 281 | }; |
282 | #define fsi_stream_handler_call(io, func, args...) \ | 282 | #define fsi_stream_handler_call(io, func, args...) \ |
@@ -1188,7 +1188,7 @@ static int fsi_pio_push(struct fsi_priv *fsi, struct fsi_stream *io) | |||
1188 | samples); | 1188 | samples); |
1189 | } | 1189 | } |
1190 | 1190 | ||
1191 | static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | 1191 | static int fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, |
1192 | int enable) | 1192 | int enable) |
1193 | { | 1193 | { |
1194 | struct fsi_master *master = fsi_get_master(fsi); | 1194 | struct fsi_master *master = fsi_get_master(fsi); |
@@ -1201,6 +1201,8 @@ static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | |||
1201 | 1201 | ||
1202 | if (fsi_is_clk_master(fsi)) | 1202 | if (fsi_is_clk_master(fsi)) |
1203 | fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); | 1203 | fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); |
1204 | |||
1205 | return 0; | ||
1204 | } | 1206 | } |
1205 | 1207 | ||
1206 | static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io) | 1208 | static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io) |
@@ -1409,7 +1411,7 @@ static int fsi_dma_transfer(struct fsi_priv *fsi, struct fsi_stream *io) | |||
1409 | return 0; | 1411 | return 0; |
1410 | } | 1412 | } |
1411 | 1413 | ||
1412 | static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | 1414 | static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, |
1413 | int start) | 1415 | int start) |
1414 | { | 1416 | { |
1415 | struct fsi_master *master = fsi_get_master(fsi); | 1417 | struct fsi_master *master = fsi_get_master(fsi); |
@@ -1422,6 +1424,8 @@ static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | |||
1422 | 1424 | ||
1423 | if (fsi_is_clk_master(fsi)) | 1425 | if (fsi_is_clk_master(fsi)) |
1424 | fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); | 1426 | fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); |
1427 | |||
1428 | return 0; | ||
1425 | } | 1429 | } |
1426 | 1430 | ||
1427 | static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev) | 1431 | static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev) |