[media] media: Remove OOM message after input_allocate_device
Emitting an OOM message isn't necessary after input_allocate_device as there's a generic OOM and a dump_stack already done. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Родитель
12d1ee1f2d
Коммит
da4a733946
|
@ -1909,10 +1909,8 @@ static struct input_dev *imon_init_idev(struct imon_context *ictx)
|
|||
int ret, i;
|
||||
|
||||
idev = input_allocate_device();
|
||||
if (!idev) {
|
||||
dev_err(ictx->dev, "input dev allocation failed\n");
|
||||
if (!idev)
|
||||
goto out;
|
||||
}
|
||||
|
||||
snprintf(ictx->name_idev, sizeof(ictx->name_idev),
|
||||
"iMON Panel, Knob and Mouse(%04x:%04x)",
|
||||
|
@ -1960,10 +1958,8 @@ static struct input_dev *imon_init_touch(struct imon_context *ictx)
|
|||
int ret;
|
||||
|
||||
touch = input_allocate_device();
|
||||
if (!touch) {
|
||||
dev_err(ictx->dev, "touchscreen input dev allocation failed\n");
|
||||
if (!touch)
|
||||
goto touch_alloc_failed;
|
||||
}
|
||||
|
||||
snprintf(ictx->name_touch, sizeof(ictx->name_touch),
|
||||
"iMON USB Touchscreen (%04x:%04x)",
|
||||
|
|
|
@ -557,10 +557,8 @@ static int em28xx_register_snapshot_button(struct em28xx *dev)
|
|||
|
||||
em28xx_info("Registering snapshot button...\n");
|
||||
input_dev = input_allocate_device();
|
||||
if (!input_dev) {
|
||||
em28xx_errdev("input_allocate_device failed\n");
|
||||
if (!input_dev)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
usb_make_path(dev->udev, dev->snapshot_button_path,
|
||||
sizeof(dev->snapshot_button_path));
|
||||
|
|
|
@ -1078,7 +1078,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
|
|||
/* register webcam snapshot button input device */
|
||||
pdev->button_dev = input_allocate_device();
|
||||
if (!pdev->button_dev) {
|
||||
PWC_ERROR("Err, insufficient memory for webcam snapshot button device.");
|
||||
rc = -ENOMEM;
|
||||
goto err_video_unreg;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче