From 6d6d652820f924d27bd493d72b89ecfd74b6c279 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 23 Feb 2012 15:40:55 +0200 Subject: [PATCH] --- yaml --- r: 293477 b: refs/heads/master c: 58db1dcde0dcf5143dc6a54017e4a72c25fb8db0 h: refs/heads/master i: 293475: 166a287ee5bf243d13f8af962cb0264b945bb24d v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/mcbsp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 385d1da5c5f6..c906e6ed8b13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2002ab35ff7f9111081824667ce331b2c33923c +refs/heads/master: 58db1dcde0dcf5143dc6a54017e4a72c25fb8db0 diff --git a/trunk/sound/soc/omap/mcbsp.c b/trunk/sound/soc/omap/mcbsp.c index 79f6da6381af..5f6c21d4b59b 100644 --- a/trunk/sound/soc/omap/mcbsp.c +++ b/trunk/sound/soc/omap/mcbsp.c @@ -318,7 +318,7 @@ static int omap_st_start(struct omap_mcbsp *mcbsp) { struct omap_mcbsp_st_data *st_data = mcbsp->st_data; - if (st_data && st_data->enabled && !st_data->running) { + if (st_data->enabled && !st_data->running) { omap_st_fir_write(mcbsp, st_data->taps); omap_st_chgain(mcbsp); @@ -350,7 +350,7 @@ static int omap_st_stop(struct omap_mcbsp *mcbsp) { struct omap_mcbsp_st_data *st_data = mcbsp->st_data; - if (st_data && st_data->running) { + if (st_data->running) { if (!mcbsp->free) { omap_st_off(mcbsp); st_data->running = 0;