aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.c12
-rw-r--r--include/linux/dvb/frontend.h1
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 7da25372078c..0ef9c2a2af87 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1262,8 +1262,10 @@ static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,
1262 goto out; 1262 goto out;
1263 } 1263 }
1264 1264
1265 for (i = 0; i < tvps->num; i++) 1265 for (i = 0; i < tvps->num; i++) {
1266 err |= dtv_property_process_set(fe, tvp + i, inode, file); 1266 (tvp + i)->result = dtv_property_process_set(fe, tvp + i, inode, file);
1267 err |= (tvp + i)->result;
1268 }
1267 1269
1268 if(fe->dtv_property_cache.state == DTV_TUNE) { 1270 if(fe->dtv_property_cache.state == DTV_TUNE) {
1269 printk("%s() Property cache is full, tuning\n", __FUNCTION__); 1271 printk("%s() Property cache is full, tuning\n", __FUNCTION__);
@@ -1295,8 +1297,10 @@ static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,
1295 goto out; 1297 goto out;
1296 } 1298 }
1297 1299
1298 for (i = 0; i < tvps->num; i++) 1300 for (i = 0; i < tvps->num; i++) {
1299 err |= dtv_property_process_get(fe, tvp + i, inode, file); 1301 (tvp + i)->result = dtv_property_process_get(fe, tvp + i, inode, file);
1302 err |= (tvp + i)->result;
1303 }
1300 1304
1301 if (copy_to_user(tvps->props, tvp, tvps->num * sizeof(struct dtv_property))) { 1305 if (copy_to_user(tvps->props, tvp, tvps->num * sizeof(struct dtv_property))) {
1302 err = -EFAULT; 1306 err = -EFAULT;
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 7c17c71edb59..b561626fc8a0 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -323,6 +323,7 @@ struct dtv_property {
323 void *reserved2; 323 void *reserved2;
324 } buffer; 324 } buffer;
325 } u; 325 } u;
326 int result;
326} __attribute__ ((packed)); 327} __attribute__ ((packed));
327 328
328/* No more than 16 properties during any given ioctl */ 329/* No more than 16 properties during any given ioctl */