Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d6fdf75 authored by Justin Waters's avatar Justin Waters Committed by Russell King
Browse files

[ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array 



Currently, the vbus_pin assignment loop is limited by the value of the "ports"
variable in the platform data.  Now that the vbus_pin array is no longer
flexible, we can use its actual size.

Signed-off-by: default avatarJustin Waters <justin.waters@timesys.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d0176f61

drivers/usb/host/ohci-at91.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -280,7 +280,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) 
		 * are always powered while this driver is active, and use

		 * are always powered while this driver is active, and use

		 * active-low power switches.

		 * active-low power switches.

		 */

		 */

		for (i = 0; i < pdata->ports; i++) {

		for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {

			if (pdata->vbus_pin[i] <= 0)

			if (pdata->vbus_pin[i] <= 0)

				continue;

				continue;

			gpio_request(pdata->vbus_pin[i], "ohci_vbus");

			gpio_request(pdata->vbus_pin[i], "ohci_vbus");
@@ -298,7 +298,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev) 
	int			i;

	int			i;





	if (pdata) {

	if (pdata) {

		for (i = 0; i < pdata->ports; i++) {

		for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {

			if (pdata->vbus_pin[i] <= 0)

			if (pdata->vbus_pin[i] <= 0)

				continue;

				continue;

			gpio_direction_output(pdata->vbus_pin[i], 1);

			gpio_direction_output(pdata->vbus_pin[i], 1);