---

yaml
---
r: 236267
b: refs/heads/master
c: 27d683a
h: refs/heads/master
i:
  236265: 238db71
  236263: 5cccd3b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a90f36206f0af9d6e2378a5f9c02dea081a04ae5
+refs/heads/master: 27d683ab79a408a6a48cb01a200af9abf82cca5a

trunk/drivers/staging/easycap/easycap_ioctl.c

@@ -330,7 +330,7 @@ int adjust_standard(struct easycap *peasycap, v4l2_std_id std_id)
 			JOM(8, "SAA register 0x%02X changed "
 			    "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
 	}
-	if (true == resubmit)
+	if (resubmit)
 		submit_video_urbs(peasycap);
 	return 0;
 }
@@ -548,7 +548,7 @@ int adjust_format(struct easycap *peasycap,
 		peasycap->offerfields = true;
 	else
 		peasycap->offerfields = false;
-	if (true == peasycap->decimatepixel)
+	if (peasycap->decimatepixel)
 		multiplier = 2;
 	else
 		multiplier = 1;
@@ -1439,7 +1439,7 @@ long easycap_unlocked_ioctl(struct file *file,
 			int mute;
 
 			JOM(8, "user requests mute %i\n", v4l2_control.value);
-			if (true == v4l2_control.value)
+			if (v4l2_control.value)
 				mute = 1;
 			else
 				mute = 0;
@@ -1560,7 +1560,7 @@ long easycap_unlocked_ioctl(struct file *file,
 
 		v4l2_frmsizeenum.type = (u32) V4L2_FRMSIZE_TYPE_DISCRETE;
 
-		if (true == peasycap->ntsc) {
+		if (peasycap->ntsc) {
 			switch (index) {
 			case 0: {
 				v4l2_frmsizeenum.discrete.width = 640;
@@ -1690,7 +1690,7 @@ long easycap_unlocked_ioctl(struct file *file,
 		if (peasycap->fps)
 			denominator = peasycap->fps;
 		else {
-			if (true == peasycap->ntsc)
+			if (peasycap->ntsc)
 				denominator = 30;
 			else
 				denominator = 25;
@@ -2265,7 +2265,7 @@ long easycap_unlocked_ioctl(struct file *file,
 		v4l2_buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 		v4l2_buffer.bytesused = peasycap->frame_buffer_used;
 		v4l2_buffer.flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE;
-		if (true == peasycap->offerfields)
+		if (peasycap->offerfields)
 			v4l2_buffer.field = V4L2_FIELD_BOTTOM;
 		else
 			v4l2_buffer.field = V4L2_FIELD_NONE;
@@ -2399,7 +2399,7 @@ long easycap_unlocked_ioctl(struct file *file,
 			pv4l2_streamparm->parm.capture.timeperframe.
 			denominator = peasycap->fps;
 		} else {
-			if (true == peasycap->ntsc) {
+			if (peasycap->ntsc) {
 				pv4l2_streamparm->parm.capture.timeperframe.
 				denominator = 30;
 			} else {

trunk/drivers/staging/easycap/easycap_low.c

@@ -388,7 +388,7 @@ int setup_stk(struct usb_device *p, bool ntsc)
 	if (NULL == p)
 		return -ENODEV;
 	i0 = 0;
-	if (true == ntsc) {
+	if (ntsc) {
 		while (0xFFF != stk1160configNTSC[i0].reg) {
 			SET(p, stk1160configNTSC[i0].reg,
 				stk1160configNTSC[i0].set);
@@ -414,7 +414,7 @@ int setup_saa(struct usb_device *p, bool ntsc)
 	if (NULL == p)
 		return -ENODEV;
 	i0 = 0;
-	if (true == ntsc) {
+	if (ntsc) {
 		while (0xFF != saa7113configNTSC[i0].reg) {
 			ir = write_saa(p, saa7113configNTSC[i0].reg,
 						saa7113configNTSC[i0].set);
@@ -552,7 +552,7 @@ int check_saa(struct usb_device *p, bool ntsc)
 		return -ENODEV;
 	i0 = 0;
 	rc = 0;
-	if (true == ntsc) {
+	if (ntsc) {
 		while (0xFF != saa7113configNTSC[i0].reg) {
 			if (0x0F == saa7113configNTSC[i0].reg) {
 				i0++;
@@ -663,7 +663,7 @@ int check_stk(struct usb_device *p, bool ntsc)
 	if (NULL == p)
 		return -ENODEV;
 	i0 = 0;
-	if (true == ntsc) {
+	if (ntsc) {
 		while (0xFFF != stk1160configNTSC[i0].reg) {
 			if (0x000 == stk1160configNTSC[i0].reg) {
 				i0++; continue;