[media] tlg2300: use correct device parent (91972923) · Commits · 戴 / test

drivers/media/usb/tlg2300/pd-main.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -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);