2010-04-02 22:46:47

by Hartley Sweeten

Subject: [PATCH] mtd/maps/physmap: catch failure to register MTD_PHYSMAP_COMPAT device

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 <[email protected]>
Cc: David Woodhouse <[email protected]>
Reported-by: Randy Dunlap <[email protected]>

---

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;
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2010-04-03 01:10:52

by Randy Dunlap

Subject: Re: [PATCH] mtd/maps/physmap: catch failure to register MTD_PHYSMAP_COMPAT device

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 <[email protected]>
> Cc: David Woodhouse <[email protected]>
> Reported-by: Randy Dunlap <[email protected]>

Thanks, Hartley.

Tested-by: Randy Dunlap <[email protected]>

> ---
>
> 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