diff --git a/[refs] b/[refs] index d830fb5faa75..01fe9b2c4121 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08d41808362a3663c0856c9720ad940a61156fb5 +refs/heads/master: 8c313111a2c843610f58d57b4e02159fecef4bbf diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c index 46848e2ae476..0fc90cd393f6 100644 --- a/trunk/drivers/media/video/videodev.c +++ b/trunk/drivers/media/video/videodev.c @@ -1575,7 +1575,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base); ret = class_device_register(&vfd->class_dev); - if (ret) { + if (ret < 0) { printk(KERN_ERR "%s: class_device_register failed\n", __FUNCTION__); goto fail_minor;