Commit df90f838 authored by Dan Carpenter's avatar Dan Carpenter Committed by Felipe Balbi

usb: gadget: uvc: fix some error codes

We're basically saying ERR_CAST(NULL) and PTR_ERR(NULL) here, which is
nonsensical.
Acked-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent d1fc4440
...@@ -148,7 +148,7 @@ static struct config_item *uvcg_control_header_make(struct config_group *group, ...@@ -148,7 +148,7 @@ static struct config_item *uvcg_control_header_make(struct config_group *group,
h = kzalloc(sizeof(*h), GFP_KERNEL); h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h) if (!h)
return ERR_CAST(h); return ERR_PTR(-ENOMEM);
h->desc.bLength = UVC_DT_HEADER_SIZE(1); h->desc.bLength = UVC_DT_HEADER_SIZE(1);
h->desc.bDescriptorType = USB_DT_CS_INTERFACE; h->desc.bDescriptorType = USB_DT_CS_INTERFACE;
...@@ -840,7 +840,7 @@ static int uvcg_streaming_header_allow_link(struct config_item *src, ...@@ -840,7 +840,7 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
format_ptr = kzalloc(sizeof(*format_ptr), GFP_KERNEL); format_ptr = kzalloc(sizeof(*format_ptr), GFP_KERNEL);
if (!format_ptr) { if (!format_ptr) {
ret = PTR_ERR(format_ptr); ret = -ENOMEM;
goto out; goto out;
} }
ret = 0; ret = 0;
...@@ -960,7 +960,7 @@ static struct config_item ...@@ -960,7 +960,7 @@ static struct config_item
h = kzalloc(sizeof(*h), GFP_KERNEL); h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h) if (!h)
return ERR_CAST(h); return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&h->formats); INIT_LIST_HEAD(&h->formats);
h->desc.bDescriptorType = USB_DT_CS_INTERFACE; h->desc.bDescriptorType = USB_DT_CS_INTERFACE;
...@@ -1278,7 +1278,7 @@ static struct config_item *uvcg_frame_make(struct config_group *group, ...@@ -1278,7 +1278,7 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
h = kzalloc(sizeof(*h), GFP_KERNEL); h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h) if (!h)
return ERR_CAST(h); return ERR_PTR(-ENOMEM);
h->frame.b_descriptor_type = USB_DT_CS_INTERFACE; h->frame.b_descriptor_type = USB_DT_CS_INTERFACE;
h->frame.b_frame_index = 1; h->frame.b_frame_index = 1;
...@@ -1563,7 +1563,7 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group, ...@@ -1563,7 +1563,7 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group,
h = kzalloc(sizeof(*h), GFP_KERNEL); h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h) if (!h)
return ERR_CAST(h); return ERR_PTR(-ENOMEM);
h->desc.bLength = UVC_DT_FORMAT_UNCOMPRESSED_SIZE; h->desc.bLength = UVC_DT_FORMAT_UNCOMPRESSED_SIZE;
h->desc.bDescriptorType = USB_DT_CS_INTERFACE; h->desc.bDescriptorType = USB_DT_CS_INTERFACE;
...@@ -1772,7 +1772,7 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group, ...@@ -1772,7 +1772,7 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group,
h = kzalloc(sizeof(*h), GFP_KERNEL); h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h) if (!h)
return ERR_CAST(h); return ERR_PTR(-ENOMEM);
h->desc.bLength = UVC_DT_FORMAT_MJPEG_SIZE; h->desc.bLength = UVC_DT_FORMAT_MJPEG_SIZE;
h->desc.bDescriptorType = USB_DT_CS_INTERFACE; h->desc.bDescriptorType = USB_DT_CS_INTERFACE;
...@@ -2124,7 +2124,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src, ...@@ -2124,7 +2124,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src,
count += 2; /* color_matching, NULL */ count += 2; /* color_matching, NULL */
*class_array = kcalloc(count, sizeof(void *), GFP_KERNEL); *class_array = kcalloc(count, sizeof(void *), GFP_KERNEL);
if (!*class_array) { if (!*class_array) {
ret = PTR_ERR(*class_array); ret = -ENOMEM;
goto unlock; goto unlock;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment