aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/mtdcore.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <dedekind@infradead.org>2006-10-11 14:52:47 +0300
committerArtem Bityutskiy <dedekind@infradead.org>2006-11-29 17:06:38 +0200
commit9c74034f8fc5d93fbe5656421cbbdc4c76ddda28 (patch)
treee5a205e124c0e42899743d765598f82a228156c2 /drivers/mtd/mtdcore.c
parent9fe912cea32aec18f860c95e8574410b5892481b (diff)
[MTD] return error code from get_mtd_device()
get_mtd_device() returns NULL in case of any failure. Teach it to return an error code instead. Fix all users as well. Signed-off-by: Artem Bityutskiy <dedekind@infradead.org>
Diffstat (limited to 'drivers/mtd/mtdcore.c')
-rw-r--r--drivers/mtd/mtdcore.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index f11f55f0241..60f237f91bb 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -193,14 +193,14 @@ int unregister_mtd_user (struct mtd_notifier *old)
* Given a number and NULL address, return the num'th entry in the device
* table, if any. Given an address and num == -1, search the device table
* for a device with that address and return if it's still present. Given
- * both, return the num'th driver only if its address matches. Return NULL
- * if not.
+ * both, return the num'th driver only if its address matches. Return
+ * error code if not.
*/
struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
{
struct mtd_info *ret = NULL;
- int i;
+ int i, err = -ENODEV;
mutex_lock(&mtd_table_mutex);
@@ -217,22 +217,24 @@ struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
if (!ret)
goto out_unlock;
- if (!try_module_get(ret->owner)) {
- ret = NULL;
+ if (!try_module_get(ret->owner))
goto out_unlock;
- }
- if (ret->get_device && ret->get_device(ret)) {
- module_put(ret->owner);
- ret = NULL;
- goto out_unlock;
+ if (ret->get_device) {
+ err = ret->get_device(ret);
+ if (err)
+ goto out_put;
}
ret->usecount++;
+ mutex_unlock(&mtd_table_mutex);
+ return ret;
+out_put:
+ module_put(ret->owner);
out_unlock:
mutex_unlock(&mtd_table_mutex);
- return ret;
+ return ERR_PTR(err);
}
/**