diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2006-07-25 09:31:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-29 17:22:34 -0300 |
| commit | 53dd8def52100ed8be4dae0cf1c2dc1f7e0fcd2c (patch) | |
| tree | ca1d6f085b8ca3dcfa07a9f00b24b4216b5a5ea9 /drivers/media/video/videodev.c | |
| parent | df2732706c745c827762aaf51892f281fb937680 (diff) | |
| download | linux-53dd8def52100ed8be4dae0cf1c2dc1f7e0fcd2c.tar.gz linux-53dd8def52100ed8be4dae0cf1c2dc1f7e0fcd2c.tar.xz | |
V4L/DVB (4367): Videodev: Handle class_device related errors
Add proper error checking and roll-back for failure of
class_device_create_file() in videodev.c. Print error messages and
unroll partially created sysfs entries.
Also, failure of class_device_register() in video_register_device() is
handled correctly. It was failing to de-allocate the minor number. This
must be done in video_register_device(), since the caller has no way of
knowing if failure occurred before or after the class device was
registered.
Also added an error message if video_register_device() is called with
an unknown type, which should never happen.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/videodev.c')
| -rw-r--r-- | drivers/media/video/videodev.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 5c5281981231..caa4f736468a 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -1538,6 +1538,8 @@ int video_register_device(struct video_device *vfd, int type, int nr) name_base = "radio"; break; default: + printk(KERN_ERR "%s called with unknown type: %d\n", + __FUNCTION__, type); return -1; } @@ -1592,6 +1594,15 @@ int video_register_device(struct video_device *vfd, int type, int nr) "http://lwn.net/Articles/36850/\n", vfd->name); #endif return 0; + +fail_classdev: + class_device_unregister(&vfd->class_dev); +fail_minor: + mutex_lock(&videodev_lock); + video_device[vfd->minor] = NULL; + vfd->minor = -1; + mutex_unlock(&videodev_lock); + return ret; } /** |