mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-07 14:06:39 +07:00
[media] tlg2300: use correct device parent
Set the correct parent for v4l2_device_register and don't set the name anymore (that's now deduced from the parent). Also remove an unnecessary forward reference and fix two weird looking log messages. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
a61660185b
commit
919729237f
@ -55,7 +55,6 @@ MODULE_PARM_DESC(debug_mode, "0 = disable, 1 = enable, 2 = verbose");
|
||||
|
||||
#define TLG2300_FIRMWARE "tlg2300_firmware.bin"
|
||||
static const char *firmware_name = TLG2300_FIRMWARE;
|
||||
static struct usb_driver poseidon_driver;
|
||||
static LIST_HEAD(pd_device_list);
|
||||
|
||||
/*
|
||||
@ -316,7 +315,7 @@ static int poseidon_suspend(struct usb_interface *intf, pm_message_t msg)
|
||||
if (get_pm_count(pd) <= 0 && !in_hibernation(pd)) {
|
||||
pd->msg.event = PM_EVENT_AUTO_SUSPEND;
|
||||
pd->pm_resume = NULL; /* a good guard */
|
||||
printk(KERN_DEBUG "\n\t+ TLG2300 auto suspend +\n\n");
|
||||
printk(KERN_DEBUG "TLG2300 auto suspend\n");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -331,7 +330,7 @@ static int poseidon_resume(struct usb_interface *intf)
|
||||
|
||||
if (!pd)
|
||||
return 0;
|
||||
printk(KERN_DEBUG "\n\t ++ TLG2300 resume ++\n\n");
|
||||
printk(KERN_DEBUG "TLG2300 resume\n");
|
||||
|
||||
if (!is_working(pd)) {
|
||||
if (PM_EVENT_AUTO_SUSPEND == pd->msg.event)
|
||||
@ -431,15 +430,11 @@ static int poseidon_probe(struct usb_interface *interface,
|
||||
usb_set_intfdata(interface, pd);
|
||||
|
||||
if (new_one) {
|
||||
struct device *dev = &interface->dev;
|
||||
|
||||
logpm(pd);
|
||||
mutex_init(&pd->lock);
|
||||
|
||||
/* register v4l2 device */
|
||||
snprintf(pd->v4l2_dev.name, sizeof(pd->v4l2_dev.name), "%s %s",
|
||||
dev->driver->name, dev_name(dev));
|
||||
ret = v4l2_device_register(NULL, &pd->v4l2_dev);
|
||||
ret = v4l2_device_register(&interface->dev, &pd->v4l2_dev);
|
||||
|
||||
/* register devices in directory /dev */
|
||||
ret = pd_video_init(pd);
|
||||
@ -530,7 +525,7 @@ module_init(poseidon_init);
|
||||
module_exit(poseidon_exit);
|
||||
|
||||
MODULE_AUTHOR("Telegent Systems");
|
||||
MODULE_DESCRIPTION("For tlg2300-based USB device ");
|
||||
MODULE_DESCRIPTION("For tlg2300-based USB device");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION("0.0.2");
|
||||
MODULE_FIRMWARE(TLG2300_FIRMWARE);
|
||||
|
Loading…
Reference in New Issue
Block a user