Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206021
b: refs/heads/master
c: 95bd64a
h: refs/heads/master
i:
  206019: 01711fa
v: v3
  • Loading branch information
Ernesto Ramos authored and Greg Kroah-Hartman committed Jul 28, 2010
1 parent fe51a47 commit ba63bd2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a741ea6efc0c78093ef5652c119262004ee7a8c9
refs/heads/master: 95bd64a893e036ccc54ceef25d4c55fcfe3a4475
10 changes: 5 additions & 5 deletions trunk/drivers/staging/tidspbridge/services/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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 (!
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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")))
Expand Down

0 comments on commit ba63bd2

Please sign in to comment.