mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
staging: most: hdm-usb: do h/w specific synchronization at configuration time
This patch puts the synchronization procedure trigger for asynchronous channels into the function hdm_configure_channel. Likewise, it removes triggering of hardware specific synchronization for other channel types from the probe function as it is not required. Signed-off-by: Andrey Shvetsov <andrey.shvetsov@k2l.de> Signed-off-by: Christian Gromm <christian.gromm@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1e80e19ce9
commit
7c23baa90d
1 changed files with 9 additions and 8 deletions
|
@ -695,6 +695,15 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
|
|||
- conf->buffer_size;
|
||||
exit:
|
||||
mdev->conf[channel] = *conf;
|
||||
if (conf->data_type == MOST_CH_ASYNC) {
|
||||
u16 ep = mdev->ep_address[channel];
|
||||
int err = drci_wr_reg(mdev->usb_device,
|
||||
DRCI_REG_BASE + DRCI_COMMAND + ep * 16,
|
||||
1);
|
||||
|
||||
if (err < 0)
|
||||
dev_warn(dev, "sync for ep%02x failed", ep);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1111,7 +1120,6 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
|
|||
struct most_channel_capability *tmp_cap;
|
||||
struct usb_endpoint_descriptor *ep_desc;
|
||||
int ret = 0;
|
||||
int err;
|
||||
|
||||
if (!mdev)
|
||||
goto exit_ENOMEM;
|
||||
|
@ -1187,13 +1195,6 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
|
|||
tmp_cap++;
|
||||
init_usb_anchor(&mdev->busy_urbs[i]);
|
||||
spin_lock_init(&mdev->channel_lock[i]);
|
||||
err = drci_wr_reg(usb_dev,
|
||||
DRCI_REG_BASE + DRCI_COMMAND +
|
||||
ep_desc->bEndpointAddress * 16,
|
||||
1);
|
||||
if (err < 0)
|
||||
dev_warn(dev, "DCI Sync for EP %02x failed",
|
||||
ep_desc->bEndpointAddress);
|
||||
}
|
||||
dev_notice(dev, "claimed gadget: Vendor=%4.4x ProdID=%4.4x Bus=%02x Device=%02x\n",
|
||||
le16_to_cpu(usb_dev->descriptor.idVendor),
|
||||
|
|
Loading…
Reference in a new issue