USB: test for NULL return from platform_get_resource() in ohci_hcd_sm501_drv_remove()

[cascardo/linux.git] / drivers / usb / host / ohci-sm501.c

diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 4ea9276..54b6ac2 100644 (file)
--- 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 */
 
@@ -224,7 +225,6 @@ static int ohci_sm501_suspend(struct platform_device *pdev, pm_message_t msg)
 
        sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 0);
        ohci_to_hcd(ohci)->state = HC_STATE_SUSPENDED;
-       dev->power.power_state = PMSG_SUSPEND;
        return 0;
 }
 
@@ -238,10 +238,12 @@ static int ohci_sm501_resume(struct platform_device *pdev)
        ohci->next_statechange = jiffies;
 
        sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 1);
-       dev->power.power_state = PMSG_ON;
        usb_hcd_resume_root_hub(platform_get_drvdata(pdev));
        return 0;
 }
+#else
+#define ohci_sm501_suspend NULL
+#define ohci_sm501_resume NULL
 #endif
 
 /*-------------------------------------------------------------------------*/
@@ -253,10 +255,8 @@ static struct platform_driver ohci_hcd_sm501_driver = {
        .probe          = ohci_hcd_sm501_drv_probe,
        .remove         = ohci_hcd_sm501_drv_remove,
        .shutdown       = usb_hcd_platform_shutdown,
-#ifdef CONFIG_PM
        .suspend        = ohci_sm501_suspend,
        .resume         = ohci_sm501_resume,
-#endif
        .driver         = {
                .owner  = THIS_MODULE,
                .name   = "sm501-usb",