Patchwork mtd/maps/physmap: catch failure to register MTD_PHYSMAP_COMPAT device

login
register
mail settings
Submitter hartleys
Date April 2, 2010, 10:46 p.m.
Message ID <0D753D10438DA54287A00B0270842697636A7E9D36@AUSP01VMBX24.collaborationhost.net>
Download mbox | patch
Permalink /patch/49329/
State New
Headers show

Comments

hartleys - April 2, 2010, 10:46 p.m.
If the default Kconfig values are used with MTD_PHYSMAP_COMPAT you end
up with a resource where end < start.  This causes __request_resource to
return a conflict which then returns an -EBUSY error code.  The current
physmap.c code just assumes that the platfom_device_register will always
succeed.

Catch this failure during the physmap_init and propogate the error.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>

---
Randy Dunlap - April 3, 2010, 1:09 a.m.
On Fri, 2 Apr 2010 17:46:30 -0500 H Hartley Sweeten wrote:

> If the default Kconfig values are used with MTD_PHYSMAP_COMPAT you end
> up with a resource where end < start.  This causes __request_resource to
> return a conflict which then returns an -EBUSY error code.  The current
> physmap.c code just assumes that the platfom_device_register will always
> succeed.
> 
> Catch this failure during the physmap_init and propogate the error.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks, Hartley.

Tested-by: Randy Dunlap <randy.dunlap@oracle.com>

> ---
> 
> diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
> index d9603f7..426461a 100644
> --- a/drivers/mtd/maps/physmap.c
> +++ b/drivers/mtd/maps/physmap.c
> @@ -264,8 +264,11 @@ static int __init physmap_init(void)
>  
>  	err = platform_driver_register(&physmap_flash_driver);
>  #ifdef CONFIG_MTD_PHYSMAP_COMPAT
> -	if (err == 0)
> -		platform_device_register(&physmap_flash);
> +	if (err == 0) {
> +		err = platform_device_register(&physmap_flash);
> +		if (err)
> +			platform_driver_unregister(&physmap_flash_driver);
> +	}
>  #endif
>  
>  	return err;


---
~Randy

Patch

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index d9603f7..426461a 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -264,8 +264,11 @@  static int __init physmap_init(void)
 
 	err = platform_driver_register(&physmap_flash_driver);
 #ifdef CONFIG_MTD_PHYSMAP_COMPAT
-	if (err == 0)
-		platform_device_register(&physmap_flash);
+	if (err == 0) {
+		err = platform_device_register(&physmap_flash);
+		if (err)
+			platform_driver_unregister(&physmap_flash_driver);
+	}
 #endif
 
 	return err;