iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: vt6656: make pControlURB available life time of driver.

Browse Source 
There is no need remove and add the control urb in device open/close.

Move to the probe and disconnect. This make the USB control in/out
functions always available to driver.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley
2013-10-09 20:18:54 +01:00
committed by Greg Kroah-Hartman
parent 4a54b61500
commit 4ad0fdb0e2
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/vt6656/main_usb.c
View File

@ -707,6 +707,12 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
INIT_WORK(&pDevice->read_work_item, RXvWorkItem); INIT_WORK(&pDevice->read_work_item, RXvWorkItem);
INIT_WORK(&pDevice->rx_mng_work_item, RXvMngWorkItem); INIT_WORK(&pDevice->rx_mng_work_item, RXvMngWorkItem);
pDevice->pControlURB = usb_alloc_urb(0, GFP_ATOMIC);
if (!pDevice->pControlURB) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR"Failed to alloc control urb\n");
goto err_nomem;
}
pDevice->tx_80211 = device_dma0_tx_80211; pDevice->tx_80211 = device_dma0_tx_80211;
pDevice->vnt_mgmt.pAdapter = (void *) pDevice; pDevice->vnt_mgmt.pAdapter = (void *) pDevice;
@ -853,23 +859,15 @@ static bool device_alloc_bufs(struct vnt_private *pDevice)
pRCB++; pRCB++;
} }
pDevice->pControlURB = usb_alloc_urb(0, GFP_ATOMIC);
if (pDevice->pControlURB == NULL) {
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc control urb\n");
goto free_rx_tx;
}
pDevice->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC); pDevice->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC);
if (pDevice->pInterruptURB == NULL) { if (pDevice->pInterruptURB == NULL) {
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int urb\n"); DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int urb\n");
usb_free_urb(pDevice->pControlURB);
goto free_rx_tx; goto free_rx_tx;
} }
pDevice->intBuf.pDataBuf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL); pDevice->intBuf.pDataBuf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
if (pDevice->intBuf.pDataBuf == NULL) { if (pDevice->intBuf.pDataBuf == NULL) {
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int buf\n"); DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int buf\n");
usb_free_urb(pDevice->pControlURB);
usb_free_urb(pDevice->pInterruptURB); usb_free_urb(pDevice->pInterruptURB);
goto free_rx_tx; goto free_rx_tx;
} }
@ -1040,9 +1038,7 @@ free_rx_tx:
device_free_rx_bufs(pDevice); device_free_rx_bufs(pDevice);
device_free_tx_bufs(pDevice); device_free_tx_bufs(pDevice);
device_free_int_bufs(pDevice); device_free_int_bufs(pDevice);
usb_kill_urb(pDevice->pControlURB);
usb_kill_urb(pDevice->pInterruptURB); usb_kill_urb(pDevice->pInterruptURB);
usb_free_urb(pDevice->pControlURB);
usb_free_urb(pDevice->pInterruptURB); usb_free_urb(pDevice->pInterruptURB);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open fail.. \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open fail.. \n");
@ -1113,9 +1109,7 @@ static int device_close(struct net_device *dev)
device_free_int_bufs(pDevice); device_free_int_bufs(pDevice);
device_free_frag_bufs(pDevice); device_free_frag_bufs(pDevice);
usb_kill_urb(pDevice->pControlURB);
usb_kill_urb(pDevice->pInterruptURB); usb_kill_urb(pDevice->pInterruptURB);
usb_free_urb(pDevice->pControlURB);
usb_free_urb(pDevice->pInterruptURB); usb_free_urb(pDevice->pInterruptURB);
BSSvClearNodeDBTable(pDevice, 0); BSSvClearNodeDBTable(pDevice, 0);
@ -1139,9 +1133,12 @@ static void vt6656_disconnect(struct usb_interface *intf)
if (device->dev) { if (device->dev) {
unregister_netdev(device->dev); unregister_netdev(device->dev);
usb_kill_urb(device->pControlURB);
usb_free_urb(device->pControlURB);
free_netdev(device->dev); free_netdev(device->dev);
} }
} }
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev)