aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorWolfram Sang <wsa-dev@sang-engineering.com>2016-08-11 17:03:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-30 13:13:53 -0400
commit15c0709119030ada50f279774170779d7260cb60 (patch)
tree91ebdb753bcb0a63d399935a9bc97078eadce7da /drivers/media
parent1fbfc53cddf47d61c5cfb7c7dc786b8eef52bfe0 (diff)
media: usb: cx231xx: cx231xx-core: don't print error when allocating urb fails
kmalloc will print enough information in case of failure. Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
index 630f4fc5155f..8ec05cb306d8 100644
--- a/drivers/media/usb/cx231xx/cx231xx-core.c
+++ b/drivers/media/usb/cx231xx/cx231xx-core.c
@@ -1035,8 +1035,6 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
1035 for (i = 0; i < dev->video_mode.isoc_ctl.num_bufs; i++) { 1035 for (i = 0; i < dev->video_mode.isoc_ctl.num_bufs; i++) {
1036 urb = usb_alloc_urb(max_packets, GFP_KERNEL); 1036 urb = usb_alloc_urb(max_packets, GFP_KERNEL);
1037 if (!urb) { 1037 if (!urb) {
1038 dev_err(dev->dev,
1039 "cannot alloc isoc_ctl.urb %i\n", i);
1040 cx231xx_uninit_isoc(dev); 1038 cx231xx_uninit_isoc(dev);
1041 return -ENOMEM; 1039 return -ENOMEM;
1042 } 1040 }
@@ -1172,8 +1170,6 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,
1172 for (i = 0; i < dev->video_mode.bulk_ctl.num_bufs; i++) { 1170 for (i = 0; i < dev->video_mode.bulk_ctl.num_bufs; i++) {
1173 urb = usb_alloc_urb(0, GFP_KERNEL); 1171 urb = usb_alloc_urb(0, GFP_KERNEL);
1174 if (!urb) { 1172 if (!urb) {
1175 dev_err(dev->dev,
1176 "cannot alloc bulk_ctl.urb %i\n", i);
1177 cx231xx_uninit_bulk(dev); 1173 cx231xx_uninit_bulk(dev);
1178 return -ENOMEM; 1174 return -ENOMEM;
1179 } 1175 }