* - max3100-spi-uart-driver-fix.patch removed from -mm tree
@ 2009-01-09 22:17 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2009-01-09 22:17 UTC (permalink / raw)
To: chripell, alan, mm-commits
The patch titled
max3100-spi-uart-driver fix
has been removed from the -mm tree. Its filename was
max3100-spi-uart-driver-fix.patch
This patch was dropped because it was folded into max3100-spi-uart-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: max3100-spi-uart-driver fix
From: Christian Pellegrin <chripell@gmail.com>
This patch fixes a problem about PM in my code that I found when testing
patches that went in -mm. The full patch against the Linus tree can be
found at http://www.evolware.org/chri/paciugo/
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/serial/max3100.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN drivers/serial/max3100.c~max3100-spi-uart-driver-fix drivers/serial/max3100.c
--- a/drivers/serial/max3100.c~max3100-spi-uart-driver-fix
+++ a/drivers/serial/max3100.c
@@ -566,6 +566,7 @@ static void max3100_shutdown(struct uart
if (s->workqueue) {
flush_workqueue(s->workqueue);
destroy_workqueue(s->workqueue);
+ s->workqueue = NULL;
}
if (s->irq)
free_irq(s->irq, s);
@@ -614,6 +615,7 @@ static int max3100_startup(struct uart_p
dev_warn(&s->spi->dev, "cannot allocate irq %d\n", s->irq);
s->irq = 0;
destroy_workqueue(s->workqueue);
+ s->workqueue = NULL;
return -EBUSY;
}
@@ -884,7 +886,8 @@ static int max3100_resume(struct spi_dev
enable_irq(s->irq);
s->conf_commit = 1;
- max3100_dowork(s);
+ if (s->workqueue)
+ max3100_dowork(s);
return 0;
}
_
Patches currently in -mm which might be from chripell@gmail.com are
origin.patch
max3100-spi-uart-driver.patch
max3100-spi-uart-driver-fix.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-01-09 22:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-09 22:17 - max3100-spi-uart-driver-fix.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.