summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-05-30 13:25:55 -0700
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-06-03 18:59:21 +0200
commitdc605dbdb8dd152448ccb8d4c4d5bd9439965a20 (patch)
tree79eb67bb0a5b4756737894c2b2ff023f7befcbc3 /drivers/net
parentf461f27a4436dbe691908fe08b867ef888848cc3 (diff)
can: cc770: Fix likely misuse of | for &
Using | with a constant is always true. Likely this should have be &. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/cc770/cc770_platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c
index 53115eee8075..688371cda37a 100644
--- a/drivers/net/can/cc770/cc770_platform.c
+++ b/drivers/net/can/cc770/cc770_platform.c
@@ -154,7 +154,7 @@ static int __devinit cc770_get_platform_data(struct platform_device *pdev,
struct cc770_platform_data *pdata = pdev->dev.platform_data;
priv->can.clock.freq = pdata->osc_freq;
- if (priv->cpu_interface | CPUIF_DSC)
+ if (priv->cpu_interface & CPUIF_DSC)
priv->can.clock.freq /= 2;
priv->clkout = pdata->cor;
priv->bus_config = pdata->bcr;