Commit 518c714a authored by Federico Vaga's avatar Federico Vaga

Merge branch 'release/v1.0.4'

parents 2924f255 d937dfe9
Pipeline #10 failed with stages
...@@ -7,6 +7,13 @@ ...@@ -7,6 +7,13 @@
Changelog Changelog
========= =========
[1.0.4] - 2019-12-16
====================
Fixed
-----
- fixes from checkpatch and coccicheck
[1.0.3] - 2019-10-08 [1.0.3] - 2019-10-08
==================== ====================
......
...@@ -14,7 +14,7 @@ export CONFIG_FMC=m ...@@ -14,7 +14,7 @@ export CONFIG_FMC=m
all: modules all: modules
clean modules help modules_install: clean modules help modules_install coccicheck:
make -C $(LINUX) M=$(shell pwd) $@ make -C $(LINUX) M=$(shell pwd) $@
.PHONY: all modules clean help install modules_install .PHONY: all modules clean help install modules_install
...@@ -207,7 +207,7 @@ err_name: ...@@ -207,7 +207,7 @@ err_name:
err_i2c: err_i2c:
devm_kfree(&carrier->dev, slot); devm_kfree(&carrier->dev, slot);
err_alloc: err_alloc:
ida_simple_remove(&fmc_slot_ida, slot->dev.id); ida_simple_remove(&fmc_slot_ida, id);
err_ida: err_ida:
return ERR_PTR(err); return ERR_PTR(err);
} }
...@@ -219,11 +219,15 @@ err_ida: ...@@ -219,11 +219,15 @@ err_ida:
*/ */
static void fmc_carrier_del_slot(struct fmc_slot *slot) static void fmc_carrier_del_slot(struct fmc_slot *slot)
{ {
int id;
if (IS_ERR_OR_NULL(slot)) if (IS_ERR_OR_NULL(slot))
return; return;
id = slot->dev.id;
fmc_slot_eeprom_del(slot); fmc_slot_eeprom_del(slot);
device_unregister(&slot->dev); device_unregister(&slot->dev);
ida_simple_remove(&fmc_slot_ida, id);
} }
/** /**
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/version.h> #include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0) #if KERNEL_VERSION(3, 11, 0) > LINUX_VERSION_CODE
/* /*
* On kernel 3.11 and greater this is included * On kernel 3.11 and greater this is included
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment