2008-03-21 21:56:13

by Jesper Juhl

[permalink] [raw]
Subject: [PATCH] test for NULL return from platform_get_resource() in ohci_hcd_sm501_drv_remove()


platform_get_resource() may return null, so although it seems it will never
do so here unless there's a bug elsewhere, it does no harm to be defensive
and test.

Signed-off-by: Jesper Juhl <[email protected]>
---

ohci-sm501.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index a970701..1ffc272 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -199,7 +199,8 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)
usb_put_hcd(hcd);
dma_release_declared_memory(&pdev->dev);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- release_mem_region(mem->start, mem->end - mem->start + 1);
+ if (mem)
+ release_mem_region(mem->start, mem->end - mem->start + 1);

/* mask interrupts and disable power */



2008-03-27 19:44:19

by David Brownell

[permalink] [raw]
Subject: Re: [PATCH] test for NULL return from platform_get_resource() in ohci_hcd_sm501_drv_remove()

On Friday 21 March 2008, Jesper Juhl wrote:
>
> platform_get_resource() may return null, so although it seems it will never
> do so here unless there's a bug elsewhere, it does no harm to be defensive
> and test.
>
> Signed-off-by: Jesper Juhl <[email protected]>

Acked-by: David Brownell <[email protected]>

(and cc the author of that code: Magnus Damm <[email protected]>)

> ---
>
> ohci-sm501.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
> index a970701..1ffc272 100644
> --- a/drivers/usb/host/ohci-sm501.c
> +++ b/drivers/usb/host/ohci-sm501.c
> @@ -199,7 +199,8 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)
> usb_put_hcd(hcd);
> dma_release_declared_memory(&pdev->dev);
> mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> - release_mem_region(mem->start, mem->end - mem->start + 1);
> + if (mem)
> + release_mem_region(mem->start, mem->end - mem->start + 1);
>
> /* mask interrupts and disable power */
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

2008-03-28 08:48:31

by Magnus Damm

[permalink] [raw]
Subject: Re: [PATCH] test for NULL return from platform_get_resource() in ohci_hcd_sm501_drv_remove()

On Fri, Mar 28, 2008 at 4:27 AM, David Brownell <[email protected]> wrote:
> On Friday 21 March 2008, Jesper Juhl wrote:
> >
> > platform_get_resource() may return null, so although it seems it will never
> > do so here unless there's a bug elsewhere, it does no harm to be defensive
> > and test.
> >
> > Signed-off-by: Jesper Juhl <[email protected]>
>
> Acked-by: David Brownell <[email protected]>
Acked-by: Magnus Damm <[email protected]>