diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:48:30 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:48:39 +0200 |
commit | 1102c660dd35725a11c7ca9365c237f2f42f6b30 (patch) | |
tree | cd32d3053b30050182218e0d36b4aed7459c48de /drivers/staging/crystalhd/crystalhd_misc.c | |
parent | 6e9101aeec39961308176e0f59e73ac5d37d243a (diff) | |
parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) |
Merge branch 'linus' into perf/urgent
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate the file without conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_misc.c')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c index 2c5138e4e1b5..5fa0c6e10ce2 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.c +++ b/drivers/staging/crystalhd/crystalhd_misc.c @@ -311,7 +311,7 @@ enum BC_STATUS crystalhd_pci_cfg_rd(struct crystalhd_adp *adp, uint32_t off, rc = -EINVAL; sts = BC_STS_INV_ARG; BCMLOG_ERR("Invalid len:%d\n", len); - }; + } if (rc && (sts == BC_STS_SUCCESS)) sts = BC_STS_ERROR; @@ -356,7 +356,7 @@ enum BC_STATUS crystalhd_pci_cfg_wr(struct crystalhd_adp *adp, uint32_t off, rc = -EINVAL; sts = BC_STS_INV_ARG; BCMLOG_ERR("Invalid len:%d\n", len); - }; + } if (rc && (sts == BC_STS_SUCCESS)) sts = BC_STS_ERROR; |