https://github.com/torvalds/linux
Revision 4ba0032984fd2626209c6aef0ee025912875bf9f authored by Linus Torvalds on 03 December 2012, 19:13:32 UTC, committed by Linus Torvalds on 03 December 2012, 19:13:32 UTC
Pull media fixes from Mauro Carvalho Chehab: "Some driver fixes for s5p/exynos (mostly race fixes)" * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] s5p-mfc: Handle multi-frame input buffer [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism [media] exynos-gsc: Add missing video device vfl_dir flag initialization [media] exynos-gsc: Fix settings for input and output image RGB type [media] exynos-gsc: Don't use mutex_lock_interruptible() in device release() [media] fimc-lite: Don't use mutex_lock_interruptible() in device release() [media] s5p-fimc: Don't use mutex_lock_interruptible() in device release() [media] s5p-fimc: Prevent race conditions during subdevs registration
Tip revision: 4ba0032984fd2626209c6aef0ee025912875bf9f authored by Linus Torvalds on 03 December 2012, 19:13:32 UTC
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Tip revision: 4ba0032
pm-notifier-error-inject.c
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/suspend.h>
#include "notifier-error-inject.h"
static int priority;
module_param(priority, int, 0);
MODULE_PARM_DESC(priority, "specify PM notifier priority");
static struct notifier_err_inject pm_notifier_err_inject = {
.actions = {
{ NOTIFIER_ERR_INJECT_ACTION(PM_HIBERNATION_PREPARE) },
{ NOTIFIER_ERR_INJECT_ACTION(PM_SUSPEND_PREPARE) },
{ NOTIFIER_ERR_INJECT_ACTION(PM_RESTORE_PREPARE) },
{}
}
};
static struct dentry *dir;
static int err_inject_init(void)
{
int err;
dir = notifier_err_inject_init("pm", notifier_err_inject_dir,
&pm_notifier_err_inject, priority);
if (IS_ERR(dir))
return PTR_ERR(dir);
err = register_pm_notifier(&pm_notifier_err_inject.nb);
if (err)
debugfs_remove_recursive(dir);
return err;
}
static void err_inject_exit(void)
{
unregister_pm_notifier(&pm_notifier_err_inject.nb);
debugfs_remove_recursive(dir);
}
module_init(err_inject_init);
module_exit(err_inject_exit);
MODULE_DESCRIPTION("PM notifier error injection module");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Akinobu Mita <akinobu.mita@gmail.com>");
Computing file changes ...