diff options
author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2013-12-12 10:38:17 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-13 12:39:00 -0400 |
commit | 85de721c46ba8ad9b283b2b3e307c9a3e8425042 (patch) | |
tree | fd49693fa164755b123d15636a10d3ee3d949d85 /drivers/media/media-device.c | |
parent | 743e18377cae643f88ff62b4c2b87c45e4ecd024 (diff) |
[media] media: Use a better owner for the media device
mdev->fops->owner is actually the owner of the very same module which
implements media_device_register(), so it can't be unloaded anyway. Instead,
use THIS_MODULE through a macro as does video_register_device().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/media-device.c')
-rw-r--r-- | drivers/media/media-device.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index d5a7a135f75d..51217f00a668 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c | |||
@@ -372,7 +372,8 @@ static void media_device_release(struct media_devnode *mdev) | |||
372 | * - dev must point to the parent device | 372 | * - dev must point to the parent device |
373 | * - model must be filled with the device model name | 373 | * - model must be filled with the device model name |
374 | */ | 374 | */ |
375 | int __must_check media_device_register(struct media_device *mdev) | 375 | int __must_check __media_device_register(struct media_device *mdev, |
376 | struct module *owner) | ||
376 | { | 377 | { |
377 | int ret; | 378 | int ret; |
378 | 379 | ||
@@ -388,7 +389,7 @@ int __must_check media_device_register(struct media_device *mdev) | |||
388 | mdev->devnode.fops = &media_device_fops; | 389 | mdev->devnode.fops = &media_device_fops; |
389 | mdev->devnode.parent = mdev->dev; | 390 | mdev->devnode.parent = mdev->dev; |
390 | mdev->devnode.release = media_device_release; | 391 | mdev->devnode.release = media_device_release; |
391 | ret = media_devnode_register(&mdev->devnode); | 392 | ret = media_devnode_register(&mdev->devnode, owner); |
392 | if (ret < 0) | 393 | if (ret < 0) |
393 | return ret; | 394 | return ret; |
394 | 395 | ||
@@ -400,7 +401,7 @@ int __must_check media_device_register(struct media_device *mdev) | |||
400 | 401 | ||
401 | return 0; | 402 | return 0; |
402 | } | 403 | } |
403 | EXPORT_SYMBOL_GPL(media_device_register); | 404 | EXPORT_SYMBOL_GPL(__media_device_register); |
404 | 405 | ||
405 | /** | 406 | /** |
406 | * media_device_unregister - unregister a media device | 407 | * media_device_unregister - unregister a media device |