diff options
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/pci/tw686x/tw686x-core.c | 4 | ||||
| -rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-subdev.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c index 101c7ccc6fd0..a10e38221817 100644 --- a/drivers/media/pci/tw686x/tw686x-core.c +++ b/drivers/media/pci/tw686x/tw686x-core.c @@ -251,14 +251,14 @@ static int tw686x_probe(struct pci_dev *pci_dev, sprintf(dev->name, "tw%04X", pci_dev->device); dev->video_channels = kzalloc_objs(*dev->video_channels, - max_channels(dev), GFP_KERNEL); + max_channels(dev)); if (!dev->video_channels) { err = -ENOMEM; goto free_dev; } dev->audio_channels = kzalloc_objs(*dev->audio_channels, - max_channels(dev), GFP_KERNEL); + max_channels(dev)); if (!dev->audio_channels) { err = -ENOMEM; goto free_video; diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index 4d3f5f863030..3c270ef00752 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -2450,7 +2450,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, /* Define and configure additional controls from cx2341x module. */ hdw->mpeg_ctrl_info = kzalloc_objs(*(hdw->mpeg_ctrl_info), - MPEGDEF_COUNT, GFP_KERNEL); + MPEGDEF_COUNT); if (!hdw->mpeg_ctrl_info) goto fail; for (idx = 0; idx < MPEGDEF_COUNT; idx++) { cptr = hdw->controls + idx + CTRLDEF_COUNT; diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 1beb9d3f1f1e..32e6f60e26c7 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1889,8 +1889,7 @@ v4l2_subdev_init_stream_configs(struct v4l2_subdev_stream_configs *stream_config if (new_configs.num_configs) { new_configs.configs = kvzalloc_objs(*new_configs.configs, - new_configs.num_configs, - GFP_KERNEL); + new_configs.num_configs); if (!new_configs.configs) return -ENOMEM; |