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

Commit 4dd7aa0f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.15-rc4' of... 

Merge tag 'fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

usb: fixes for v3.15-rc4

Small pull request this time containing only 3 patches.

One patch is fixing at91 resource retrieval, one fixes a
conditional in the generic OTG FSM and another fixes a
state transition also on our generic OTG FSM.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>
parents d1db0eea 886c7c42

drivers/usb/gadget/at91_udc.c

+0 −10
Original line number Diff line number Diff line
@@ -1709,16 +1709,6 @@ static int at91udc_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	if (pdev->num_resources != 2) {

		DBG("invalid num_resources\n");

		return -ENODEV;

	}

	if ((pdev->resource[0].flags != IORESOURCE_MEM)

			|| (pdev->resource[1].flags != IORESOURCE_IRQ)) {

		DBG("invalid resource type\n");

		return -ENODEV;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENXIO;

drivers/usb/phy/phy-fsm-usb.c

+5 −4
Original line number Diff line number Diff line
@@ -303,17 +303,18 @@ int otg_statemachine(struct otg_fsm *fsm) 
			otg_set_state(fsm, OTG_STATE_A_WAIT_VRISE);

		break;

	case OTG_STATE_A_WAIT_VRISE:

		if (fsm->id || fsm->a_bus_drop || fsm->a_vbus_vld ||

				fsm->a_wait_vrise_tmout) {

		if (fsm->a_vbus_vld)

			otg_set_state(fsm, OTG_STATE_A_WAIT_BCON);

		}

		else if (fsm->id || fsm->a_bus_drop ||

				fsm->a_wait_vrise_tmout)

			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);

		break;

	case OTG_STATE_A_WAIT_BCON:

		if (!fsm->a_vbus_vld)

			otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);

		else if (fsm->b_conn)

			otg_set_state(fsm, OTG_STATE_A_HOST);

		else if (fsm->id | fsm->a_bus_drop | fsm->a_wait_bcon_tmout)

		else if (fsm->id || fsm->a_bus_drop || fsm->a_wait_bcon_tmout)

			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);

		break;

	case OTG_STATE_A_HOST: