public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Pavel Machek <pavel@ucw.cz>,
	Andrew Morton <akpm@linux-foundation.org>,
	Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 7/8] serial: serial_cs: oxsemi quirk breaks resume
Date: Wed, 20 Jan 2010 15:50:02 -0800	[thread overview]
Message-ID: <1264031403-32239-7-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20100120234759.GC32068@kroah.com>

From: Pavel Machek <pavel@ucw.cz>

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>
---
 drivers/serial/serial_cs.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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... */
-- 
1.6.5.7


  parent reply	other threads:[~2010-01-20 23:52 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-20 23:47 [GIT PATCH] TTY patches for 2.6.33-rc4 Greg KH
2010-01-20 23:49 ` [PATCH 1/8] compat_ioctl: Supress "unknown cmd" message on serial /dev/console Greg Kroah-Hartman
2010-01-21  0:39   ` Arnd Bergmann
2010-01-20 23:49 ` [PATCH 2/8] nozomi: quick fix for the close/close bug Greg Kroah-Hartman
2010-01-20 23:49 ` [PATCH 3/8] serial: 8250_pnp: use wildcard for serial Wacom tablets Greg Kroah-Hartman
2010-01-20 23:49 ` [PATCH 4/8] serial-core: resume serial hardware with no_console_suspend Greg Kroah-Hartman
2010-01-20 23:50 ` [PATCH 5/8] serial: Fix crash if the minimum rate of the device is > 9600 baud Greg Kroah-Hartman
2010-01-20 23:50 ` [PATCH 6/8] serial: imx: bit &/| confusion Greg Kroah-Hartman
2010-01-21 13:34   ` Sascha Hauer
2010-01-20 23:50 ` Greg Kroah-Hartman [this message]
2010-01-20 23:50 ` [PATCH 8/8] tty: fix race in tty_fasync Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1264031403-32239-7-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel@ucw.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox