flash: fix clang static analyzer build errors

[openocd.git] / src / flash / nand / davinci.c

diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c
index c88046d6b8af24d85e48766f11d483b7f941d2dc..1aa7ffc0578658a7a8c54584801d9852d9953b1d 100644 (file)
--- a/src/flash/nand/davinci.c
+++ b/src/flash/nand/davinci.c
@@ -12,9 +12,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 /*
@@ -607,8 +605,6 @@ static int davinci_write_page_ecc4infix(struct nand_device *nand, uint32_t page,
                /* write this "out-of-band" data -- infix */
                davinci_write_block_data(nand, oob, 16);
                oob += 16;
-               oob_size -= 16;
-
        } while (data_size);
 
        /* the last data and OOB writes included the spare area */
@@ -732,8 +728,8 @@ NAND_DEVICE_COMMAND_HANDLER(davinci_nand_device_command)
                goto fail;
        }
 
-       info = calloc(1, sizeof *info);
-       if (info == NULL)
+       info = calloc(1, sizeof(*info));
+       if (!info)
                goto fail;
 
        info->eccmode = eccmode;