The patch titled
ks0127 status flags
has been removed from the -mm tree. Its filename was
ks0127-status-flags.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ks0127 status flags
From: Martin Samuelsson <sam@xxxxxxx>
Or status flags together in DECODER_GET_STATUS instead of and-zapping them.
Signed-off-by: Martin Samuelsson <sam@xxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/media/video/ks0127.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/media/video/ks0127.c~ks0127-status-flags drivers/media/video/ks0127.c
--- a/drivers/media/video/ks0127.c~ks0127-status-flags
+++ a/drivers/media/video/ks0127.c
@@ -712,13 +712,13 @@ static int ks0127_command(struct i2c_cli
*iarg = 0;
status = ks0127_read(ks, KS_STAT);
if (!(status & 0x20)) /* NOVID not set */
- *iarg = (*iarg & DECODER_STATUS_GOOD);
+ *iarg = (*iarg | DECODER_STATUS_GOOD);
if ((status & 0x01)) /* CLOCK set */
- *iarg = (*iarg & DECODER_STATUS_COLOR);
+ *iarg = (*iarg | DECODER_STATUS_COLOR);
if ((status & 0x08)) /* PALDET set */
- *iarg = (*iarg & DECODER_STATUS_PAL);
+ *iarg = (*iarg | DECODER_STATUS_PAL);
else
- *iarg = (*iarg & DECODER_STATUS_NTSC);
+ *iarg = (*iarg | DECODER_STATUS_NTSC);
break;
//Catch any unknown command
_
Patches currently in -mm which might be from sam@xxxxxxx are
git-dvb.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
