Skip to content

Commit

Permalink
V4L/DVB (11162): pvrusb2: Tie up loose ends with v4l2-subdev setup
Browse files Browse the repository at this point in the history
Tie up loose ends with v4l2-subdev setup.  Set attached module's group
ID to match our internal ID, emit a few useful messages when
sub-devices are dealt with, implement better error legs, and fix an
error in the old i2c layer (caused by changes related to the
v4l2-subdev work here).

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mike Isely authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 15b4744 commit 446dfdc
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions drivers/media/video/pvrusb2/pvrusb2-hdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -2020,17 +2020,26 @@ static void pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
i2caddr);
}

if (!sd) {
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
"Module ID %u for device %s failed to load"
" (this is probably a bad thing...)",
mid, hdw->hdw_desc->description);
return;
}

/* Tag this sub-device instance with the module ID we know about.
In other places we'll use that tag to determine if the instance
requires special handling. */
sd->grp_id = mid;

/* If we have both old and new i2c layers enabled, make sure that
old layer isn't also tracking this module. This is a debugging
aid, in normal situations there's no reason for both mechanisms
to be enabled. */
pvr2_i2c_untrack_subdev(hdw, sd);
pvr2_trace(PVR2_TRACE_INIT, "Attached sub-driver %s", fname);

// ?????
/* Based on module ID, we should remember subdev pointers
so that we can send certain custom commands where
needed. */
// ?????

}

Expand Down

0 comments on commit 446dfdc

Please sign in to comment.