From 0eb5f4b0fd5564ab1baeca25f2931e84649e2a2e Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 8 Feb 2012 20:28:23 +0900 Subject: [PATCH] --- yaml --- r: 291715 b: refs/heads/master c: d4b48ba395a6289fbd72c1b883cc52ee680d967a h: refs/heads/master i: 291713: 4b05d47da4f400e1b17853d0fcf806372d9a0731 291711: dcca023fa8039e37d564b768321c7db701b2ccde v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_hif.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 277c5ac983d4..0b68afb1c9b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31cf913da3664f4804a346792937a3bad15cdede +refs/heads/master: d4b48ba395a6289fbd72c1b883cc52ee680d967a diff --git a/trunk/drivers/media/dvb/mantis/mantis_hif.c b/trunk/drivers/media/dvb/mantis/mantis_hif.c index 672cf4d2462d..10c68df7e16f 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_hif.c +++ b/trunk/drivers/media/dvb/mantis/mantis_hif.c @@ -76,7 +76,7 @@ static int mantis_hif_write_wait(struct mantis_ca *ca) udelay(500); timeout++; if (timeout > 100) { - dprintk(MANTIS_ERROR, 1, "Adater(%d) Slot(0): Write operation timed out!", mantis->num); + dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Write operation timed out!", mantis->num); rc = -ETIMEDOUT; break; }