Re: [char-misc-next 01/11 RESEND] mei: add mei_hbuf_acquire wrapper

From: Greg KH
Date: Tue Feb 18 2014 - 13:02:40 EST


On Mon, Feb 17, 2014 at 03:13:17PM +0200, Tomas Winkler wrote:
> A client has to acquire host buffer
> before writing, we add lock like wrapper
> to replace the code snippet
>
> if (dev->hbuf_is_ready)
> dev->hbuf_is_ready = false;
>
> Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
> ---
> drivers/misc/mei/amthif.c | 7 +-----
> drivers/misc/mei/client.c | 56 ++++++++++++++++++++++++++++----------------
> drivers/misc/mei/hw-me.c | 2 ++
> drivers/misc/mei/hw-txe.c | 17 +++++---------
> drivers/misc/mei/interrupt.c | 6 ++---
> drivers/misc/mei/mei_dev.h | 2 ++
> drivers/misc/mei/wd.c | 14 +++++------
> 7 files changed, 57 insertions(+), 47 deletions(-)

This patch fails to apply to my char-misc-next branch (I've pulled in
3.14-rc3 into this branch now):
checking file drivers/misc/mei/amthif.c
checking file drivers/misc/mei/client.c
Hunk #4 FAILED at 681.
Hunk #5 succeeded at 815 (offset -2 lines).
Hunk #6 succeeded at 848 (offset -2 lines).
1 out of 6 hunks FAILED
checking file drivers/misc/mei/hw-me.c
checking file drivers/misc/mei/hw-txe.c
checking file drivers/misc/mei/interrupt.c
checking file drivers/misc/mei/mei_dev.h
checking file drivers/misc/mei/wd.c

Care to fix this up and resend this series?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/