---

yaml --- r: 114022 b: refs/heads/master c: d48cb40 h: refs/heads/master v: v3
git-mirror · Oct 12, 2008 · 70923d7 · 70923d7
1 parent 98ae557
commit 70923d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 459702bf98ae2bd20bad1e271c615aca4972c609
+refs/heads/master: d48cb402a1ba48c4ad4a36c3c561386027318459
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1262,8 +1262,10 @@ static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,
 			goto out;
 		}
 
-		for (i = 0; i < tvps->num; i++)
-			err |= dtv_property_process_set(fe, tvp + i, inode, file);
+		for (i = 0; i < tvps->num; i++) {
+			(tvp + i)->result = dtv_property_process_set(fe, tvp + i, inode, file);
+			err |= (tvp + i)->result;
+		}
 
 		if(fe->dtv_property_cache.state == DTV_TUNE) {
 			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,
 			goto out;
 		}
 
-		for (i = 0; i < tvps->num; i++)
-			err |= dtv_property_process_get(fe, tvp + i, inode, file);
+		for (i = 0; i < tvps->num; i++) {
+			(tvp + i)->result = dtv_property_process_get(fe, tvp + i, inode, file);
+			err |= (tvp + i)->result;
+		}
 
 		if (copy_to_user(tvps->props, tvp, tvps->num * sizeof(struct dtv_property))) {
 			err = -EFAULT;

diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h
@@ -323,6 +323,7 @@ struct dtv_property {
 			void *reserved2;
 		} buffer;
 	} u;
+	int result;
 } __attribute__ ((packed));
 
 /* No more than 16 properties during any given ioctl */