summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/imx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-05-09 14:23:34 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-05-09 14:23:34 -0600
commit17cfb7007f3f4e253d3533ee87349ce1b8e4885e (patch)
treefb175af19fa6835f8929ee075ff16acfeb49f904 /nuttx/arch/arm/src/imx
parent4495dfb36135744a6f903e32ac2215b1f3ab0452 (diff)
downloadpx4-nuttx-17cfb7007f3f4e253d3533ee87349ce1b8e4885e.tar.gz
px4-nuttx-17cfb7007f3f4e253d3533ee87349ce1b8e4885e.tar.bz2
px4-nuttx-17cfb7007f3f4e253d3533ee87349ce1b8e4885e.zip
Various changes and bigfixes for problems detected by CppCheck
Diffstat (limited to 'nuttx/arch/arm/src/imx')
-rw-r--r--nuttx/arch/arm/src/imx/imx_spi.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/imx/imx_spi.c b/nuttx/arch/arm/src/imx/imx_spi.c
index 5ee601263..4d846af3c 100644
--- a/nuttx/arch/arm/src/imx/imx_spi.c
+++ b/nuttx/arch/arm/src/imx/imx_spi.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/imx/imx_spi.c
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -728,9 +728,12 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
{
struct imx_spidev_s *priv = (struct imx_spidev_s *)dev;
- uint32_t actual = priv->actual;
+ uint32_t actual;
- if (priv && frequency != priv->frequency)
+ DEBUGASSERT(priv);
+ actual = priv->actual;
+
+ if (frequency != priv->frequency)
{
uint32_t freqbits;
uint32_t regval;