2013/8/15 Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>
>
> On Tue, Aug 13, 2013 at 07:18:15PM +0800, Barry Song wrote:
> > pinctrl core will get default pinmux, so drop it in the sirfsoc serial driver.
> >
> > Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
> > Signed-off-by: Barry Song <Baohua.Song@xxxxxxx>
> > ---
> > drivers/tty/serial/sirfsoc_uart.c | 12 ------------
> > drivers/tty/serial/sirfsoc_uart.h | 1 -
> > 2 files changed, 13 deletions(-)
>
> This patch fails to apply to my tree:
>
> checking file drivers/tty/serial/sirfsoc_uart.c
> Hunk #3 FAILED at 917.
> Hunk #4 FAILED at 928.
> 2 out of 4 hunks FAILED
> checking file drivers/tty/serial/sirfsoc_uart.h
>
> And as such, I can't take any of the patches in this series :(
>
> Care to redo them against my tty-next branch if you wish to have them
> applied?
>
i am sorry, and will be more careful later. i did not rebase to
tty-next this time as i thought i have sync my local tree same with
your tree but missed an external patch of dropping
platform_set_drvdata(pdev, NULL);
index 3b9382b..d28f38b 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -924,7 +924,6 @@ port_err:
clk_disable_unprepare(sirfport->clk);
clk_put(sirfport->clk);
clk_err:
- platform_set_drvdata(pdev, NULL);
if (sirfport->hw_flow_ctrl)
pinctrl_put(sirfport->p);
err:
@@ -935,7 +934,7 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
{
struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
struct uart_port *port = &sirfport->port;
- platform_set_drvdata(pdev, NULL);
+
if (sirfport->hw_flow_ctrl)
pinctrl_put(sirfport->p);
clk_disable_unprepare(sirfport->clk);
i will send v2 to fix it.
> thanks,
>
> greg k-h
-barry
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
