From: Hu Gang <hugang@soulinfo.com>
To: linux-kernel@vger.kernel.org
Subject: patch for 2.5.42. 2/2
Date: Sun, 13 Oct 2002 11:20:19 +0800 [thread overview]
Message-ID: <20021013112019.496010fc.hugang@soulinfo.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1965 bytes --]
Hello Pavel Machek:
With this patch, My machine has work very fine. Without it my machine will hangup/Oops in suspend/resume.
By the way, If i'm right , I can change other driver in kernel to this model.
--- linux-2.5.42/sound/pci/intel8x0.c Sat Oct 12 21:24:58 2002
+++ linux-2.5.42-suspend/sound/pci/intel8x0.c Sat Oct 12 21:21:12 2002
@@ -1891,6 +1891,8 @@
{
snd_card_t *card = chip->card;
+ if (chip->in_suspend)
+ return;
chip->in_suspend = 1;
snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
@@ -1909,7 +1911,10 @@
snd_card_t *card = chip->card;
int i;
+ if (!chip->in_suspend)
+ return;
snd_power_lock(card);
+ chip->in_suspend = 0;
if (card->power_state == SNDRV_CTL_POWER_D0)
goto __skip;
@@ -1919,7 +1924,6 @@
if (chip->ac97[i])
snd_ac97_resume(chip->ac97[i]);
- chip->in_suspend = 0;
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
__skip:
snd_power_unlock(card);
--- linux-2.5.42/drivers/net/3c59x.c Sat Oct 12 21:25:00 2002
+++ linux-2.5.42-suspend/drivers/net/3c59x.c Sat Oct 12 21:20:48 2002
@@ -809,6 +809,9 @@
spinlock_t lock; /* Serialise access to device & its vortex_private */
spinlock_t mdio_lock; /* Serialise access to mdio hardware */
u32 power_state[16];
+#ifdef CONFIG_PM
+ int in_suspend;
+#endif
};
/* The action to take with a media selection timer tick.
@@ -893,6 +896,10 @@
struct net_device *dev = pci_get_drvdata(pdev);
if (dev && dev->priv) {
+ struct vortex_private *vp = dev->priv;
+ if (vp->in_suspend)
+ return 0;
+ vp->in_suspend = 1;
if (netif_running(dev)) {
netif_device_detach(dev);
vortex_down(dev);
@@ -906,6 +913,10 @@
struct net_device *dev = pci_get_drvdata(pdev);
if (dev && dev->priv) {
+ struct vortex_private *vp = dev->priv;
+ if (!vp->in_suspend)
+ return 0;
+ vp->in_suspend = 1;
if (netif_running(dev)) {
vortex_up(dev);
netif_device_attach(dev);
--
- Hu Gang
[-- Attachment #1.2: 00000004.mimetmp --]
[-- Type: text/plain, Size: 1965 bytes --]
Hello Pavel Machek:
With this patch, My machine has work very fine. Without it my machine will hangup/Oops in suspend/resume.
By the way, If i'm right , I can change other driver in kernel to this model.
--- linux-2.5.42/sound/pci/intel8x0.c Sat Oct 12 21:24:58 2002
+++ linux-2.5.42-suspend/sound/pci/intel8x0.c Sat Oct 12 21:21:12 2002
@@ -1891,6 +1891,8 @@
{
snd_card_t *card = chip->card;
+ if (chip->in_suspend)
+ return;
chip->in_suspend = 1;
snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
@@ -1909,7 +1911,10 @@
snd_card_t *card = chip->card;
int i;
+ if (!chip->in_suspend)
+ return;
snd_power_lock(card);
+ chip->in_suspend = 0;
if (card->power_state == SNDRV_CTL_POWER_D0)
goto __skip;
@@ -1919,7 +1924,6 @@
if (chip->ac97[i])
snd_ac97_resume(chip->ac97[i]);
- chip->in_suspend = 0;
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
__skip:
snd_power_unlock(card);
--- linux-2.5.42/drivers/net/3c59x.c Sat Oct 12 21:25:00 2002
+++ linux-2.5.42-suspend/drivers/net/3c59x.c Sat Oct 12 21:20:48 2002
@@ -809,6 +809,9 @@
spinlock_t lock; /* Serialise access to device & its vortex_private */
spinlock_t mdio_lock; /* Serialise access to mdio hardware */
u32 power_state[16];
+#ifdef CONFIG_PM
+ int in_suspend;
+#endif
};
/* The action to take with a media selection timer tick.
@@ -893,6 +896,10 @@
struct net_device *dev = pci_get_drvdata(pdev);
if (dev && dev->priv) {
+ struct vortex_private *vp = dev->priv;
+ if (vp->in_suspend)
+ return 0;
+ vp->in_suspend = 1;
if (netif_running(dev)) {
netif_device_detach(dev);
vortex_down(dev);
@@ -906,6 +913,10 @@
struct net_device *dev = pci_get_drvdata(pdev);
if (dev && dev->priv) {
+ struct vortex_private *vp = dev->priv;
+ if (!vp->in_suspend)
+ return 0;
+ vp->in_suspend = 1;
if (netif_running(dev)) {
vortex_up(dev);
netif_device_attach(dev);
--
- Hu Gang
[-- Attachment #1.3: 00000003.mimetmp --]
[-- Type: application/pgp-signature, Size: 191 bytes --]
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2002-10-13 3:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-13 3:20 Hu Gang [this message]
2002-10-13 3:34 ` patch for 2.5.42. 2/2 Rik van Riel
2002-10-13 3:33 ` Hu Gang
2002-10-14 16:52 ` Pavel Machek
2002-10-15 14:10 ` Rik van Riel
2002-10-15 20:11 ` Pavel Machek
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=20021013112019.496010fc.hugang@soulinfo.com \
--to=hugang@soulinfo.com \
--cc=linux-kernel@vger.kernel.org \
/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