From f71a0f5ce8d12057d388da0146b404a9e63e88c1 Mon Sep 17 00:00:00 2001 From: Christian Auby Date: Tue, 6 Dec 2011 12:15:41 +0000 Subject: [PATCH] --- yaml --- r: 278503 b: refs/heads/master c: 1e226773c7e79051aa8a48258fe6ae61d20332bf h: refs/heads/master i: 278501: 09fb5aa6bafbda4de6074dc42c34ccf2e5b37d97 278499: 46b0a64f6ed25acdfddab892d0ecd8761a16a0e0 278495: fd9e19edb75922378f83f07ca577774c7bdaab6c v: v3 --- [refs] | 2 +- trunk/drivers/net/caif/caif_hsi.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 61e9899718e1..5021efafd335 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87a115783eca7a424eef599d6f10a499f85f59c8 +refs/heads/master: 1e226773c7e79051aa8a48258fe6ae61d20332bf diff --git a/trunk/drivers/net/caif/caif_hsi.c b/trunk/drivers/net/caif/caif_hsi.c index 073352517adc..a85b29e797f0 100644 --- a/trunk/drivers/net/caif/caif_hsi.c +++ b/trunk/drivers/net/caif/caif_hsi.c @@ -117,15 +117,6 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi) dev_dbg(&cfhsi->ndev->dev, "%s.\n", __func__); - - ret = cfhsi->dev->cfhsi_wake_up(cfhsi->dev); - if (ret) { - dev_warn(&cfhsi->ndev->dev, - "%s: can't wake up HSI interface: %d.\n", - __func__, ret); - return ret; - } - do { ret = cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev, &fifo_occupancy); @@ -168,8 +159,6 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi) } } while (1); - cfhsi->dev->cfhsi_wake_down(cfhsi->dev); - return ret; }