From ba63bd2004511b111c4a085c554b46ac234ed4d6 Mon Sep 17 00:00:00 2001 From: Ernesto Ramos Date: Wed, 28 Jul 2010 09:45:27 -0500 Subject: [PATCH] --- yaml --- r: 206021 b: refs/heads/master c: 95bd64a893e036ccc54ceef25d4c55fcfe3a4475 h: refs/heads/master i: 206019: 01711fa9199f8ca2fe14c7b5e3aafa824d59b739 v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/services/cfg.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ceac0f4706f9..7c049b90cf3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a741ea6efc0c78093ef5652c119262004ee7a8c9 +refs/heads/master: 95bd64a893e036ccc54ceef25d4c55fcfe3a4475 diff --git a/trunk/drivers/staging/tidspbridge/services/cfg.c b/trunk/drivers/staging/tidspbridge/services/cfg.c index 4ab3cd748fc9..c3f33f6292f9 100644 --- a/trunk/drivers/staging/tidspbridge/services/cfg.c +++ b/trunk/drivers/staging/tidspbridge/services/cfg.c @@ -62,7 +62,7 @@ int cfg_get_auto_start(struct cfg_devnode *dev_node_obj, status = -EFAULT; if (!auto_start || !drv_datap) status = -EFAULT; - if (DSP_SUCCEEDED(status)) + if (!status) *auto_start = (drv_datap->base_img) ? 1 : 0; DBC_ENSURE((status == 0 && @@ -93,7 +93,7 @@ int cfg_get_dev_object(struct cfg_devnode *dev_node_obj, status = -EFAULT; dw_buf_size = sizeof(value); - if (DSP_SUCCEEDED(status)) { + if (!status) { /* check the device string and then store dev object */ if (! @@ -127,7 +127,7 @@ int cfg_get_exec_file(struct cfg_devnode *dev_node_obj, u32 buf_size, if (strlen(drv_datap->base_img) > buf_size) status = -EINVAL; - if (DSP_SUCCEEDED(status) && drv_datap->base_img) + if (!status && drv_datap->base_img) strcpy(str_exec_file, drv_datap->base_img); if (DSP_FAILED(status)) @@ -178,7 +178,7 @@ int cfg_get_object(u32 *value, u8 dw_type) *value = 0; pr_err("%s: Failed, status 0x%x\n", __func__, status); } - DBC_ENSURE((DSP_SUCCEEDED(status) && *value != 0) || + DBC_ENSURE((!status && *value != 0) || (DSP_FAILED(status) && *value == 0)); return status; } @@ -211,7 +211,7 @@ int cfg_set_dev_object(struct cfg_devnode *dev_node_obj, u32 value) if (!dev_node_obj) status = -EFAULT; - if (DSP_SUCCEEDED(status)) { + if (!status) { /* Store the Bridge device object in the Registry */ if (!(strcmp((char *)dev_node_obj, "TIOMAP1510")))