diff --git a/[refs] b/[refs] index 4c7ed7c0c17e..895026595ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8018c9e78b0ff4bb0290e46f4045fb4ea589ae8 +refs/heads/master: 616f8878bc5b5b2276f1941643d9ca7c88690305 diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c index 7f4212928e9f..0db955c2d9b9 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-input.c +++ b/trunk/drivers/media/video/saa7134/saa7134-input.c @@ -173,7 +173,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2); - if (0x400000 &~ gpio) + if (0x400000 & ~gpio) return 0; /* No button press */ ir->c.addr = 0x5a >> 1;