From 502158a86800e7d63e80cf43a7b3a47c8f9cac95 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Mon, 20 Feb 2012 02:35:20 -0300 Subject: [PATCH] --- yaml --- r: 306241 b: refs/heads/master c: 598e978aadd39e24749e0da5a6cff568570b1d00 h: refs/heads/master i: 306239: 1db134bd48c879a6616b48a8a81793bb2005a91a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0f58f096daf7..63ae17537ab8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8329f8e17af85c568768fb268e0695dd1fc8148 +refs/heads/master: 598e978aadd39e24749e0da5a6cff568570b1d00 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 4c1a47470d39..7bddfaeeafc3 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -1309,10 +1309,12 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, struct usb_device *usbdev; int mindevnum; int unit_number; + struct pvr2_hdw *hdw; int *nr_ptr = NULL; dip->v4lp = vp; - usbdev = pvr2_hdw_get_dev(vp->channel.mc_head->hdw); + hdw = vp->channel.mc_head->hdw; + usbdev = pvr2_hdw_get_dev(hdw); dip->v4l_type = v4l_type; switch (v4l_type) { case VFL_TYPE_GRABBER: @@ -1351,13 +1353,13 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, { int val; pvr2_ctrl_get_value( - pvr2_hdw_get_ctrl_by_id(vp->channel.mc_head->hdw, + pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_STDAVAIL), &val); dip->devbase.tvnorms = (v4l2_std_id)val; } mindevnum = -1; - unit_number = pvr2_hdw_get_unit_number(vp->channel.mc_head->hdw); + unit_number = pvr2_hdw_get_unit_number(hdw); if (nr_ptr && (unit_number >= 0) && (unit_number < PVR_NUM)) { mindevnum = nr_ptr[unit_number]; } @@ -1374,7 +1376,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, video_device_node_name(&dip->devbase), pvr2_config_get_name(dip->config)); - pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw, + pvr2_hdw_v4l_store_minor_number(hdw, dip->minor_type,dip->devbase.minor); }