diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 07:28:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 07:28:57 -0700 |
commit | a9e4820c4c170b3df0d2185f7b4130b0b2daed2c (patch) | |
tree | 962bc52ba0e8e585d88e1fb9a9be9a67072767dd /drivers/usb/media/se401.c | |
parent | c0698f2f6e4839ce9463ce731c892993215ea067 (diff) | |
parent | e838a0d4d5260bce452c96914a6e86b217c53c55 (diff) |
Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Yah, it does work to merge. Knock wood.
Diffstat (limited to 'drivers/usb/media/se401.c')
-rw-r--r-- | drivers/usb/media/se401.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/usb/media/se401.c b/drivers/usb/media/se401.c index 685bdae5cb6..f69e443cd1b 100644 --- a/drivers/usb/media/se401.c +++ b/drivers/usb/media/se401.c @@ -868,13 +868,14 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401) se401->dev = NULL; - for (i=0; i<SE401_NUMSBUF; i++) if (se401->urb[i]) { - usb_kill_urb(se401->urb[i]); - usb_free_urb(se401->urb[i]); - se401->urb[i] = NULL; - kfree(se401->sbuf[i].data); - } - for (i=0; i<SE401_NUMSCRATCH; i++) if (se401->scratch[i].data) { + for (i=0; i<SE401_NUMSBUF; i++) + if (se401->urb[i]) { + usb_kill_urb(se401->urb[i]); + usb_free_urb(se401->urb[i]); + se401->urb[i] = NULL; + kfree(se401->sbuf[i].data); + } + for (i=0; i<SE401_NUMSCRATCH; i++) { kfree(se401->scratch[i].data); } if (se401->inturb) { |