Skip to content

Commit

Permalink
generic: platform/mikrotik: release mtd device after use
Browse files Browse the repository at this point in the history
The code uses get_mtd_device_nm() which must be followed by a call to
put_mtd_device() once the handle is no longer used.

This fixes spurious shutdown console messages such as:
[ 2256.334562] Removing MTD device openwrt#7 (soft_config) with use count 1

Reported-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
  • Loading branch information
f00b4r0 authored and Koen Vandeputte committed May 12, 2021
1 parent e724966 commit 4e385a2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
Expand Up @@ -697,10 +697,13 @@ int __init rb_hardconfig_init(struct kobject *rb_kobj)

hc_buflen = mtd->size;
hc_buf = kmalloc(hc_buflen, GFP_KERNEL);
if (!hc_buf)
if (!hc_buf) {
put_mtd_device(mtd);
return -ENOMEM;
}

ret = mtd_read(mtd, 0, hc_buflen, &bytes_read, hc_buf);
put_mtd_device(mtd);

if (ret)
goto fail;
Expand Down
Expand Up @@ -686,6 +686,8 @@ static ssize_t sc_commit_store(struct kobject *kobj, struct kobj_attribute *attr
}
write_unlock(&sc_bufrwl);

put_mtd_device(mtd);

if (ret)
goto mtdfail;

Expand Down Expand Up @@ -721,10 +723,13 @@ int __init rb_softconfig_init(struct kobject *rb_kobj)

sc_buflen = mtd->size;
sc_buf = kmalloc(sc_buflen, GFP_KERNEL);
if (!sc_buf)
if (!sc_buf) {
put_mtd_device(mtd);
return -ENOMEM;
}

ret = mtd_read(mtd, 0, sc_buflen, &bytes_read, sc_buf);
put_mtd_device(mtd);

if (ret)
goto fail;
Expand Down

0 comments on commit 4e385a2

Please sign in to comment.