usb: add support for STA2X11 host driver

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / isp1760-if.c

diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 2ac4ac2e4ef95208be6d1ae2b42af1840cb42bb9..4592dc17a9f9e1e0978e5ff2b68f841fdfa0577c 100644 (file)
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -47,23 +47,27 @@ static int of_isp1760_probe(struct platform_device *dev)
        int virq;
        resource_size_t res_len;
        int ret;
-       const unsigned int *prop;
        unsigned int devflags = 0;
        enum of_gpio_flags gpio_flags;
+       u32 bus_width = 0;
 
        drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
 
        ret = of_address_to_resource(dp, 0, &memory);
-       if (ret)
-               return -ENXIO;
+       if (ret) {
+               ret = -ENXIO;
+               goto free_data;
+       }
 
        res_len = resource_size(&memory);
 
        res = request_mem_region(memory.start, res_len, dev_name(&dev->dev));
-       if (!res)
-               return -EBUSY;
+       if (!res) {
+               ret = -EBUSY;
+               goto free_data;
+       }
 
        if (of_irq_map_one(dp, 0, &oirq)) {
                ret = -ENODEV;
@@ -77,8 +81,8 @@ static int of_isp1760_probe(struct platform_device *dev)
                devflags |= ISP1760_FLAG_ISP1761;
 
        /* Some systems wire up only 16 of the 32 data lines */
-       prop = of_get_property(dp, "bus-width", NULL);
-       if (prop && *prop == 16)
+       of_property_read_u32(dp, "bus-width", &bus_width);
+       if (bus_width == 16)
                devflags |= ISP1760_FLAG_BUS_WIDTH_16;
 
        if (of_get_property(dp, "port1-otg", NULL) != NULL)
@@ -125,6 +129,7 @@ free_gpio:
                gpio_free(drvdata->rst_gpio);
 release_reg:
        release_mem_region(memory.start, res_len);
+free_data:
        kfree(drvdata);
        return ret;
 }