diff options
-rw-r--r-- | sound/soc/sh/fsi.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index bdaca356aaad..913916a3f716 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -2009,6 +2009,7 @@ static int fsi_probe(struct platform_device *pdev) | |||
2009 | struct fsi_master *master; | 2009 | struct fsi_master *master; |
2010 | const struct platform_device_id *id_entry; | 2010 | const struct platform_device_id *id_entry; |
2011 | struct sh_fsi_platform_info *info = pdev->dev.platform_data; | 2011 | struct sh_fsi_platform_info *info = pdev->dev.platform_data; |
2012 | struct fsi_priv *fsi; | ||
2012 | struct resource *res; | 2013 | struct resource *res; |
2013 | unsigned int irq; | 2014 | unsigned int irq; |
2014 | int ret; | 2015 | int ret; |
@@ -2045,22 +2046,24 @@ static int fsi_probe(struct platform_device *pdev) | |||
2045 | spin_lock_init(&master->lock); | 2046 | spin_lock_init(&master->lock); |
2046 | 2047 | ||
2047 | /* FSI A setting */ | 2048 | /* FSI A setting */ |
2048 | master->fsia.base = master->base; | 2049 | fsi = &master->fsia; |
2049 | master->fsia.master = master; | 2050 | fsi->base = master->base; |
2050 | master->fsia.info = &info->port_a; | 2051 | fsi->master = master; |
2051 | fsi_handler_init(&master->fsia); | 2052 | fsi->info = &info->port_a; |
2052 | ret = fsi_stream_probe(&master->fsia, &pdev->dev); | 2053 | fsi_handler_init(fsi); |
2054 | ret = fsi_stream_probe(fsi, &pdev->dev); | ||
2053 | if (ret < 0) { | 2055 | if (ret < 0) { |
2054 | dev_err(&pdev->dev, "FSIA stream probe failed\n"); | 2056 | dev_err(&pdev->dev, "FSIA stream probe failed\n"); |
2055 | return ret; | 2057 | return ret; |
2056 | } | 2058 | } |
2057 | 2059 | ||
2058 | /* FSI B setting */ | 2060 | /* FSI B setting */ |
2059 | master->fsib.base = master->base + 0x40; | 2061 | fsi = &master->fsib; |
2060 | master->fsib.master = master; | 2062 | fsi->base = master->base + 0x40; |
2061 | master->fsib.info = &info->port_b; | 2063 | fsi->master = master; |
2062 | fsi_handler_init(&master->fsib); | 2064 | fsi->info = &info->port_b; |
2063 | ret = fsi_stream_probe(&master->fsib, &pdev->dev); | 2065 | fsi_handler_init(fsi); |
2066 | ret = fsi_stream_probe(fsi, &pdev->dev); | ||
2064 | if (ret < 0) { | 2067 | if (ret < 0) { |
2065 | dev_err(&pdev->dev, "FSIB stream probe failed\n"); | 2068 | dev_err(&pdev->dev, "FSIB stream probe failed\n"); |
2066 | goto exit_fsia; | 2069 | goto exit_fsia; |