Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a89baa2 authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13222): pvrusb2: Make more info available to udev 



pvrusb2: Associate V4L device node in sysfs with the underlying USB
device.  This opens the door to device information tracking in udev

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5abaa530

drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+14 −1
Original line number Diff line number Diff line
@@ -913,6 +913,15 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) 
}





static void pvr2_v4l2_dev_disassociate_parent(struct pvr2_v4l2_dev *dip)

{

	if (!dip) return;

	if (!dip->devbase.parent) return;

	dip->devbase.parent = NULL;

	device_move(&dip->devbase.dev, NULL, DPM_ORDER_NONE);

}





static void pvr2_v4l2_destroy_no_lock(struct pvr2_v4l2 *vp)

{

	if (vp->dev_video) {
@@ -943,6 +952,8 @@ static void pvr2_v4l2_internal_check(struct pvr2_channel *chp) 
	struct pvr2_v4l2 *vp;

	vp = container_of(chp,struct pvr2_v4l2,channel);

	if (!vp->channel.mc_head->disconnect_flag) return;

	pvr2_v4l2_dev_disassociate_parent(vp->dev_video);

	pvr2_v4l2_dev_disassociate_parent(vp->dev_radio);

	if (vp->vfirst) return;

	pvr2_v4l2_destroy_no_lock(vp);

}
@@ -1250,12 +1261,13 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, 
			       struct pvr2_v4l2 *vp,

			       int v4l_type)

{

	struct usb_device *usbdev;

	int mindevnum;

	int unit_number;

	int *nr_ptr = NULL;

	dip->v4lp = vp;





	usbdev = pvr2_hdw_get_dev(vp->channel.mc_head->hdw);

	dip->v4l_type = v4l_type;

	switch (v4l_type) {

	case VFL_TYPE_GRABBER:
@@ -1296,6 +1308,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, 
	if (nr_ptr && (unit_number >= 0) && (unit_number < PVR_NUM)) {

		mindevnum = nr_ptr[unit_number];

	}

	dip->devbase.parent = &usbdev->dev;

	if ((video_register_device(&dip->devbase,

				   dip->v4l_type, mindevnum) < 0) &&

	    (video_register_device(&dip->devbase,