summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2019-11-25 14:49:49 -0600
committerJohn Klug <john.klug@multitech.com>2019-11-25 14:49:49 -0600
commit6e4b26e60ab0fb6379da856309f5aefe52ac109e (patch)
tree3e58891e2261b70e0aa09b2e0419a477f1aface4
parenta32e476a3f4ca8605ce1013288dab90f8e89cff7 (diff)
downloadmts-io-4.2.2.tar.gz
mts-io-4.2.2.tar.bz2
mts-io-4.2.2.zip
Do not clean up what has not been created yet4.2.2
-rw-r--r--configure.ac2
-rw-r--r--io-module/mts-io.c8
-rw-r--r--io-module/mts_io_module.h2
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"