Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next

[deliverable/linux.git] / drivers / block / osdblk.c

diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 1bbc681688e4375aa5098bd1b99d85b38baa796e..79aa179305b5e6fc5a84c5a7e80506626cb26e38 100644 (file)
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -598,7 +598,7 @@ static ssize_t class_osdblk_remove(struct class *c,
        unsigned long ul;
        struct list_head *tmp;
 
-       rc = strict_strtoul(buf, 10, &ul);
+       rc = kstrtoul(buf, 10, &ul);
        if (rc)
                return rc;