diff --git a/[refs] b/[refs] index 7e2a1fd08768..e99c815751fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bc7b38731dd1cc1635ab12f8de48866f603b06e +refs/heads/master: 3a7a882420d378b59542a048075e40428c771a12 diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c index b606f811eeb4..1ed602a0f24c 100644 --- a/trunk/drivers/mtd/mtdchar.c +++ b/trunk/drivers/mtd/mtdchar.c @@ -1,5 +1,5 @@ /* - * $Id: mtdchar.c,v 1.72 2005/06/30 00:23:24 tpoynor Exp $ + * $Id: mtdchar.c,v 1.73 2005/07/04 17:36:41 gleixner Exp $ * * Character-device access to raw MTD devices. * @@ -649,7 +649,7 @@ static int __init init_mtdchar(void) if (IS_ERR(mtd_class)) { printk(KERN_ERR "Error creating mtd class.\n"); unregister_chrdev(MTD_CHAR_MAJOR, "mtd"); - return 1; + return PTR_ERR(mtd_class); } register_mtd_user(¬ifier);