| Message ID | 20210521133026.17296-1-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3c0bb3107703d2c58f7a0a7a2060bb57bc120326 |
| Headers | show |
| Series | mmc: vub3000: fix control-request direction | expand |
On Fri, 21 May 2021 at 15:30, Johan Hovold <johan@kernel.org> wrote: > > The direction of the pipe argument must match the request-type direction > bit or control requests may fail depending on the host-controller-driver > implementation. > > Fix the SET_ROM_WAIT_STATES request which erroneously used > usb_rcvctrlpipe(). > > Fixes: 88095e7b473a ("mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver") > Cc: stable@vger.kernel.org # 3.0 > Signed-off-by: Johan Hovold <johan@kernel.org> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/vub300.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c > index 739cf63ef6e2..4950d10d3a19 100644 > --- a/drivers/mmc/host/vub300.c > +++ b/drivers/mmc/host/vub300.c > @@ -2279,7 +2279,7 @@ static int vub300_probe(struct usb_interface *interface, > if (retval < 0) > goto error5; > retval = > - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), > + usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), > SET_ROM_WAIT_STATES, > USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > firmware_rom_wait_states, 0x0000, NULL, 0, HZ); > -- > 2.26.3 >
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index 739cf63ef6e2..4950d10d3a19 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c @@ -2279,7 +2279,7 @@ static int vub300_probe(struct usb_interface *interface, if (retval < 0) goto error5; retval = - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), + usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), SET_ROM_WAIT_STATES, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, firmware_rom_wait_states, 0x0000, NULL, 0, HZ);
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation. Fix the SET_ROM_WAIT_STATES request which erroneously used usb_rcvctrlpipe(). Fixes: 88095e7b473a ("mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver") Cc: stable@vger.kernel.org # 3.0 Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/mmc/host/vub300.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)