Skip to content
Snippets Groups Projects
Commit b5b01370 authored by Satish Kodishala's avatar Satish Kodishala Committed by Gerrit - the friendly Code Review server
Browse files

FM: jni: Treat only negative return values as errors

FM kernel driver can return zero or positive
values in case of success. Make changes to treat
only negative return values as errors.

Change-Id: Ief859af604349a2e47daee18693723600154d1a9
parent fdaa2e8f
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ int FmIoctlsInterface :: get_cur_freq ...@@ -50,7 +50,7 @@ int FmIoctlsInterface :: get_cur_freq
channel.type = V4L2_TUNER_RADIO; channel.type = V4L2_TUNER_RADIO;
ret = ioctl(fd, VIDIOC_G_FREQUENCY, &channel); ret = ioctl(fd, VIDIOC_G_FREQUENCY, &channel);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
freq = (channel.frequency / TUNE_MULT); freq = (channel.frequency / TUNE_MULT);
...@@ -70,7 +70,7 @@ int FmIoctlsInterface :: set_freq ...@@ -70,7 +70,7 @@ int FmIoctlsInterface :: set_freq
channel.frequency = (freq * TUNE_MULT); channel.frequency = (freq * TUNE_MULT);
ret = ioctl(fd, VIDIOC_S_FREQUENCY, &channel); ret = ioctl(fd, VIDIOC_S_FREQUENCY, &channel);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
return FM_SUCCESS; return FM_SUCCESS;
...@@ -90,7 +90,7 @@ int FmIoctlsInterface :: set_control ...@@ -90,7 +90,7 @@ int FmIoctlsInterface :: set_control
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
ret = ioctl(fd, VIDIOC_S_CTRL, &control); ret = ioctl(fd, VIDIOC_S_CTRL, &control);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
ret = FM_FAILURE; ret = FM_FAILURE;
}else { }else {
ret = FM_SUCCESS; ret = FM_SUCCESS;
...@@ -127,7 +127,7 @@ int FmIoctlsInterface :: set_calibration ...@@ -127,7 +127,7 @@ int FmIoctlsInterface :: set_calibration
v4l2_ctls.count = 1; v4l2_ctls.count = 1;
v4l2_ctls.controls = &ext_ctl; v4l2_ctls.controls = &ext_ctl;
ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, &v4l2_ctls); ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, &v4l2_ctls);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
ALOGE("%s: ioctl call failed\n", LOGTAG); ALOGE("%s: ioctl call failed\n", LOGTAG);
return FM_FAILURE; return FM_FAILURE;
}else { }else {
...@@ -148,7 +148,7 @@ int FmIoctlsInterface :: get_control ...@@ -148,7 +148,7 @@ int FmIoctlsInterface :: get_control
control.id = id; control.id = id;
ret = ioctl(fd, VIDIOC_G_CTRL, &control); ret = ioctl(fd, VIDIOC_G_CTRL, &control);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
val = control.value; val = control.value;
...@@ -168,7 +168,7 @@ int FmIoctlsInterface :: start_search ...@@ -168,7 +168,7 @@ int FmIoctlsInterface :: start_search
hw_seek.type = V4L2_TUNER_RADIO; hw_seek.type = V4L2_TUNER_RADIO;
ret = ioctl(fd, VIDIOC_S_HW_FREQ_SEEK, &hw_seek); ret = ioctl(fd, VIDIOC_S_HW_FREQ_SEEK, &hw_seek);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
return FM_SUCCESS; return FM_SUCCESS;
...@@ -190,7 +190,7 @@ int FmIoctlsInterface :: set_band ...@@ -190,7 +190,7 @@ int FmIoctlsInterface :: set_band
ret = ioctl(fd, VIDIOC_S_TUNER, &tuner); ret = ioctl(fd, VIDIOC_S_TUNER, &tuner);
ret = set_control(fd, V4L2_CID_PRV_REGION, 0); ret = set_control(fd, V4L2_CID_PRV_REGION, 0);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
return FM_SUCCESS; return FM_SUCCESS;
...@@ -208,7 +208,7 @@ int FmIoctlsInterface :: get_rmssi ...@@ -208,7 +208,7 @@ int FmIoctlsInterface :: get_rmssi
tuner.index = 0; tuner.index = 0;
tuner.signal = 0; tuner.signal = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner); ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
ret = FM_FAILURE; ret = FM_FAILURE;
}else { }else {
rmssi = tuner.signal; rmssi = tuner.signal;
...@@ -227,7 +227,7 @@ int FmIoctlsInterface :: get_upperband_limit ...@@ -227,7 +227,7 @@ int FmIoctlsInterface :: get_upperband_limit
tuner.index = 0; tuner.index = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner); ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
freq = (tuner.rangehigh / TUNE_MULT); freq = (tuner.rangehigh / TUNE_MULT);
...@@ -245,7 +245,7 @@ int FmIoctlsInterface :: get_lowerband_limit ...@@ -245,7 +245,7 @@ int FmIoctlsInterface :: get_lowerband_limit
tuner.index = 0; tuner.index = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner); ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
freq = (tuner.rangelow / TUNE_MULT); freq = (tuner.rangelow / TUNE_MULT);
...@@ -263,12 +263,12 @@ int FmIoctlsInterface :: set_audio_mode ...@@ -263,12 +263,12 @@ int FmIoctlsInterface :: set_audio_mode
tuner.index = 0; tuner.index = 0;
ret = ioctl(fd, VIDIOC_G_TUNER, &tuner); ret = ioctl(fd, VIDIOC_G_TUNER, &tuner);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
tuner.audmode = mode; tuner.audmode = mode;
ret = ioctl(fd, VIDIOC_S_TUNER, &tuner); ret = ioctl(fd, VIDIOC_S_TUNER, &tuner);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
return FM_SUCCESS; return FM_SUCCESS;
...@@ -293,7 +293,7 @@ int FmIoctlsInterface :: get_buffer ...@@ -293,7 +293,7 @@ int FmIoctlsInterface :: get_buffer
v4l2_buf.length = STD_BUF_SIZE; v4l2_buf.length = STD_BUF_SIZE;
v4l2_buf.m.userptr = (ULINT)buff; v4l2_buf.m.userptr = (ULINT)buff;
ret = ioctl(fd, VIDIOC_DQBUF, &v4l2_buf); ret = ioctl(fd, VIDIOC_DQBUF, &v4l2_buf);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
return v4l2_buf.bytesused; return v4l2_buf.bytesused;
...@@ -311,7 +311,7 @@ int FmIoctlsInterface :: set_ext_control ...@@ -311,7 +311,7 @@ int FmIoctlsInterface :: set_ext_control
ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, v4l2_ctls); ret = ioctl(fd, VIDIOC_S_EXT_CTRLS, v4l2_ctls);
if(ret != IOCTL_SUCC) { if(ret < IOCTL_SUCC) {
return FM_FAILURE; return FM_FAILURE;
}else { }else {
return FM_SUCCESS; return FM_SUCCESS;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment