Auto merge with /home/aegl/GIT/linus

[linux-2.6] / drivers / usb / media / dabusb.c

diff --git a/drivers/usb/media/dabusb.c b/drivers/usb/media/dabusb.c
index 8823297d219165b4e899f62b1a51cc8ade8728e6..6ca2fae99d2d75026bec3d29007378171fd14274 100644 (file)
--- a/drivers/usb/media/dabusb.c
+++ b/drivers/usb/media/dabusb.c
@@ -138,8 +138,7 @@ static int dabusb_free_queue (struct list_head *q)
 #ifdef DEBUG 
                dump_urb(b->purb);
 #endif
-               if (b->purb->transfer_buffer)
-                       kfree (b->purb->transfer_buffer);
+               kfree(b->purb->transfer_buffer);
                usb_free_urb(b->purb);
                tmp = p->next;
                list_del (p);