Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / drivers / media / usb / cx231xx / cx231xx-audio.c

diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c
index a6a9508418f8eebef0a4ae41c1e312610afb598c..4cd5fa91612f62dd0f99631c7d01b49a9a5fa419 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-audio.c
+++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
@@ -293,7 +293,6 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)
                memset(dev->adev.transfer_buffer[i], 0x80, sb_size);
                urb = usb_alloc_urb(CX231XX_ISO_NUM_AUDIO_PACKETS, GFP_ATOMIC);
                if (!urb) {
-                       dev_err(dev->dev, "usb_alloc_urb failed!\n");
                        for (j = 0; j < i; j++) {
                                usb_free_urb(dev->adev.urb[j]);
                                kfree(dev->adev.transfer_buffer[j]);
@@ -355,7 +354,6 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)
                memset(dev->adev.transfer_buffer[i], 0x80, sb_size);
                urb = usb_alloc_urb(CX231XX_NUM_AUDIO_PACKETS, GFP_ATOMIC);
                if (!urb) {
-                       dev_err(dev->dev, "usb_alloc_urb failed!\n");
                        for (j = 0; j < i; j++) {
                                usb_free_urb(dev->adev.urb[j]);
                                kfree(dev->adev.transfer_buffer[j]);