From ef0eeaabc11bd3a9e928f8bac255a256a54e6ef2 Mon Sep 17 00:00:00 2001 From: Dave Martin Date: Fri, 2 Dec 2011 16:58:18 +0000 Subject: [PATCH] --- yaml --- r: 280795 b: refs/heads/master c: 8ad028bd973ec1ead4982e21ab0400c956aff4b5 h: refs/heads/master i: 280793: 3531084b97311b9b4cfc899656fe25ff60625810 280791: db85beb00c9de8555415a1c5d99623d35eb6b59a v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/isp1760-if.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 03cb9368e0f3..5607e1fcf805 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fb57a019f94ea0c1290c39b8da753be155af41c +refs/heads/master: 8ad028bd973ec1ead4982e21ab0400c956aff4b5 diff --git a/trunk/drivers/usb/host/isp1760-if.c b/trunk/drivers/usb/host/isp1760-if.c index a7dc1e1d45f2..b605224fb9e3 100644 --- a/trunk/drivers/usb/host/isp1760-if.c +++ b/trunk/drivers/usb/host/isp1760-if.c @@ -47,9 +47,9 @@ 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) @@ -77,8 +77,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)