From 6e4b26e60ab0fb6379da856309f5aefe52ac109e Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 25 Nov 2019 14:49:49 -0600 Subject: Do not clean up what has not been created yet --- configure.ac | 2 +- io-module/mts-io.c | 8 +++----- io-module/mts_io_module.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index b889065..97f3c09 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mts-io], [4.2.1]) +AC_INIT([mts-io], [4.2.2]) AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c]) AM_INIT_AUTOMAKE AM_CONFIG_HEADER([config.h]) diff --git a/io-module/mts-io.c b/io-module/mts-io.c index 7078708..6f928b5 100644 --- a/io-module/mts-io.c +++ b/io-module/mts-io.c @@ -959,21 +959,19 @@ static int __init mts_io_init(void) platform_driver_unregister(&mts_io_driver); mts_io_platform_device = platform_device_alloc(PLATFORM_NAME, -1); - if (!mts_io_platform_device) { - cleanup(); + if (!mts_io_platform_device) return -ENOMEM; - } /* request_firmware() requires a device, so call after device allocated */ ret = mts_id_eeprom_load(); if (ret) { - cleanup(); + kfree(mts_io_platform_device); return ret; } ret = platform_device_add(mts_io_platform_device); if (ret) { - cleanup(); + kfree(mts_io_platform_device); return ret; } diff --git a/io-module/mts_io_module.h b/io-module/mts_io_module.h index 28e9e58..5d333c6 100644 --- a/io-module/mts_io_module.h +++ b/io-module/mts_io_module.h @@ -5,7 +5,7 @@ * MTAC cards. */ -#define DRIVER_VERSION "v4.2.1" +#define DRIVER_VERSION "v4.2.2" #define DRIVER_AUTHOR "Multitech Systems" #define DRIVER_DESC "MTS-IO Controller" #define DRIVER_NAME "mts-io" -- cgit v1.2.3