Commit 07de1ab5 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[PATCH] More pmac-zilog sleep fix

In the long story of "BenH can't get a simple fix right the first time",
please add this one to pmac_zilog, and now people should enjoy really
working sleep again on pmac laptops ...

If the serial port was closed, we could use an uninitialized "pwr_delay"
and pass that to schedule_timeout().
parent 3dfc2f73
...@@ -1626,7 +1626,7 @@ static int pmz_resume(struct macio_dev *mdev) ...@@ -1626,7 +1626,7 @@ static int pmz_resume(struct macio_dev *mdev)
struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev);
struct uart_state *state; struct uart_state *state;
unsigned long flags; unsigned long flags;
int pwr_delay; int pwr_delay = 0;
if (uap == NULL) if (uap == NULL)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment