From: Pavel Machek <pavel@ucw.cz>
Date: Wed, 9 Dec 2009 20:31:31 +0000 (-0800)
Subject: serial: serial_cs: oxsemi quirk breaks resume
X-Git-Tag: v2.6.33-rc5~4^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18c576f950167ff3ec1e56dcbbec7b87288b3237;p=platform%2Fkernel%2Flinux-stable.git

serial: serial_cs: oxsemi quirk breaks resume

Quirk is applied on all cards with given manfid (is it that correct?).
Unfortunately, that quirk breaks resume on zaurus with billionton
bluetooth card inserted: c950ctrl is 0 and outb() faults.

I believe it is simply not a multiport card.  (info->multi == 1).  ...
...  confirmed by printks.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 0ee7239..df85440 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -146,7 +146,8 @@ static void quirk_wakeup_oxsemi(struct pcmcia_device *link)
 {
 	struct serial_info *info = link->priv;
 
-	outb(12, info->c950ctrl + 1);
+	if (info->c950ctrl)
+		outb(12, info->c950ctrl + 1);
 }
 
 /* request_region? oxsemi branch does no request_region too... */