From a0eb6d969bbb8cbdf8d7f62c6422df496b0ca140 Mon Sep 17 00:00:00 2001 From: Nicu Pavel Date: Fri, 28 Oct 2011 13:30:09 +0300 Subject: [PATCH 673/696] [minibox-picopc-android] Fixed android-3.0 merge --- drivers/mmc/card/block.c | 2 -- net/bluetooth/l2cap_core.c | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 007f76c..2bcf93c 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1041,8 +1041,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, mqrq->mmc_active.mrq = &brq->mrq; mqrq->mmc_active.err_check = mmc_blk_err_check; - } else if (disable_multi == 1) { - disable_multi = 0; mmc_queue_bounce_pre(mqrq); } diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index b341b55..54134e0 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -3266,6 +3266,7 @@ void l2cap_chan_busy(struct l2cap_chan *chan, int busy) l2cap_ertm_enter_local_busy(chan); else l2cap_ertm_exit_local_busy(chan); + } } static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *skb, u16 control) -- 1.7.1