Commit 1af4a45f authored by sigmunau's avatar sigmunau
Browse files

fix compile faults and semantic errors in pvr module, mostly relating to the new api

parent a2283772
...@@ -428,7 +428,7 @@ static int ConfigureV4L2( access_t * p_access ) ...@@ -428,7 +428,7 @@ static int ConfigureV4L2( access_t * p_access )
controls.controls = calloc( sizeof( struct v4l2_ext_control ), controls.controls = calloc( sizeof( struct v4l2_ext_control ),
MAX_V4L2_CTRLS ); MAX_V4L2_CTRLS );
if( controls.control == NULL ) if( controls.controls == NULL )
return VLC_ENOMEM; return VLC_ENOMEM;
/* Note: Ignore frame rate. Doesn't look like it can be changed. */ /* Note: Ignore frame rate. Doesn't look like it can be changed. */
...@@ -524,7 +524,7 @@ static int ConfigureV4L2( access_t * p_access ) ...@@ -524,7 +524,7 @@ static int ConfigureV4L2( access_t * p_access )
msg_Err( p_access, "Failed to write %u new capture card settings.", msg_Err( p_access, "Failed to write %u new capture card settings.",
controls.error_idx ); controls.error_idx );
} }
free( control.controls ); free( controls.controls );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -1018,9 +1018,9 @@ static int Open( vlc_object_t * p_this ) ...@@ -1018,9 +1018,9 @@ static int Open( vlc_object_t * p_this )
{ {
#ifdef HAVE_NEW_LINUX_VIDEODEV2_H #ifdef HAVE_NEW_LINUX_VIDEODEV2_H
result = ConfigureV4L2( p_access ); result = ConfigureV4L2( p_access );
if( !result ) if( result != VLC_SUCCESS )
{ {
Close( p_access ); Close( VLC_OBJECT(p_access) );
return result; return result;
} }
#else #else
...@@ -1031,7 +1031,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -1031,7 +1031,7 @@ static int Open( vlc_object_t * p_this )
else else
{ {
result = ConfigureIVTV( p_access ); result = ConfigureIVTV( p_access );
if( !result ) if( result != VLC_SUCCESS )
{ {
Close( VLC_OBJECT(p_access) ); Close( VLC_OBJECT(p_access) );
return result; return result;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment