From bb5b36a041a92d2443d0908901608694ec5e8ba6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 1 Feb 2011 15:46:05 +0000 Subject: [PATCH] --- yaml --- r: 233558 b: refs/heads/master c: 644e6e4a7fa6b11d59f24032997d90ea0d858d03 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/pcmcia/cm4000_cs.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0bd6f6a6c0f0..fcbbb5da1788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b703683b6cc3cb97bbe6b1b14898b273eb59279 +refs/heads/master: 644e6e4a7fa6b11d59f24032997d90ea0d858d03 diff --git a/trunk/drivers/char/pcmcia/cm4000_cs.c b/trunk/drivers/char/pcmcia/cm4000_cs.c index 777181a2e603..bcbbc71febb7 100644 --- a/trunk/drivers/char/pcmcia/cm4000_cs.c +++ b/trunk/drivers/char/pcmcia/cm4000_cs.c @@ -830,8 +830,7 @@ static void monitor_card(unsigned long p) test_bit(IS_ANY_T1, &dev->flags))) { DEBUGP(4, dev, "Perform AUTOPPS\n"); set_bit(IS_AUTOPPS_ACT, &dev->flags); - ptsreq.protocol = ptsreq.protocol = - (0x01 << dev->proto); + ptsreq.protocol = (0x01 << dev->proto); ptsreq.flags = 0x01; ptsreq.pts1 = 0x00; ptsreq.pts2 = 0x00;