From 8a870cc96b432443da5e7279b1b04d5dbf896fd1 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 23 Feb 2012 15:38:37 +0200 Subject: [PATCH] --- yaml --- r: 293476 b: refs/heads/master c: e2002ab35ff7f9111081824667ce331b2c33923c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/mcbsp.c | 21 +++++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 72e8b218c15e..385d1da5c5f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8fb4907a74dbcbd0b21e02380d58e422bd4a1fe +refs/heads/master: e2002ab35ff7f9111081824667ce331b2c33923c diff --git a/trunk/sound/soc/omap/mcbsp.c b/trunk/sound/soc/omap/mcbsp.c index fe4734e0c18c..79f6da6381af 100644 --- a/trunk/sound/soc/omap/mcbsp.c +++ b/trunk/sound/soc/omap/mcbsp.c @@ -273,11 +273,9 @@ static void omap_st_chgain(struct omap_mcbsp *mcbsp) int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain) { - struct omap_mcbsp_st_data *st_data; + struct omap_mcbsp_st_data *st_data = mcbsp->st_data; int ret = 0; - st_data = mcbsp->st_data; - if (!st_data) return -ENOENT; @@ -298,11 +296,9 @@ int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain) int omap_st_get_chgain(struct omap_mcbsp *mcbsp, int channel, s16 *chgain) { - struct omap_mcbsp_st_data *st_data; + struct omap_mcbsp_st_data *st_data = mcbsp->st_data; int ret = 0; - st_data = mcbsp->st_data; - if (!st_data) return -ENOENT; @@ -337,9 +333,7 @@ static int omap_st_start(struct omap_mcbsp *mcbsp) int omap_st_enable(struct omap_mcbsp *mcbsp) { - struct omap_mcbsp_st_data *st_data; - - st_data = mcbsp->st_data; + struct omap_mcbsp_st_data *st_data = mcbsp->st_data; if (!st_data) return -ENODEV; @@ -368,11 +362,9 @@ static int omap_st_stop(struct omap_mcbsp *mcbsp) int omap_st_disable(struct omap_mcbsp *mcbsp) { - struct omap_mcbsp_st_data *st_data; + struct omap_mcbsp_st_data *st_data = mcbsp->st_data; int ret = 0; - st_data = mcbsp->st_data; - if (!st_data) return -ENODEV; @@ -386,14 +378,11 @@ int omap_st_disable(struct omap_mcbsp *mcbsp) int omap_st_is_enabled(struct omap_mcbsp *mcbsp) { - struct omap_mcbsp_st_data *st_data; - - st_data = mcbsp->st_data; + struct omap_mcbsp_st_data *st_data = mcbsp->st_data; if (!st_data) return -ENODEV; - return st_data->enabled; }