Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261551AbUKOIn7 (ORCPT ); Mon, 15 Nov 2004 03:43:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261555AbUKOIn7 (ORCPT ); Mon, 15 Nov 2004 03:43:59 -0500 Received: from canuck.infradead.org ([205.233.218.70]:36624 "EHLO canuck.infradead.org") by vger.kernel.org with ESMTP id S261551AbUKOIn5 (ORCPT ); Mon, 15 Nov 2004 03:43:57 -0500 Subject: Re: [PATCH]eepro100 resume failure From: Arjan van de Ven To: Li Shaohua Cc: lkml , Andrew Morton , Jeff Garzik In-Reply-To: <1100507449.31599.9.camel@sli10-desk.sh.intel.com> References: <1100507449.31599.9.camel@sli10-desk.sh.intel.com> Content-Type: text/plain Message-Id: <1100508226.2936.11.camel@laptop.fenrus.org> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 (1.4.6-2.dwmw2.1) Date: Mon, 15 Nov 2004 09:43:47 +0100 Content-Transfer-Encoding: 7bit X-Spam-Score: 3.7 (+++) X-Spam-Report: SpamAssassin version 2.63 on canuck.infradead.org summary: Content analysis details: (3.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.1 RCVD_IN_DSBL RBL: Received via a relay in list.dsbl.org [] 2.5 RCVD_IN_DYNABLOCK RBL: Sent directly from dynamic IP address [80.57.133.107 listed in dnsbl.sorbs.net] 0.1 RCVD_IN_SORBS RBL: SORBS: sender is listed in SORBS [80.57.133.107 listed in dnsbl.sorbs.net] X-SRS-Rewrite: SMTP reverse-path rewritten from by canuck.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 702 Lines: 23 > > @@ -2337,7 +2337,12 @@ static int eepro100_resume(struct pci_de > struct speedo_private *sp = netdev_priv(dev); > long ioaddr = dev->base_addr; > > + pci_set_power_state(pdev, 0); > pci_restore_state(pdev); > + if (pdev->is_enabled) > + pci_enable_device(pdev); > + if (pdev->is_busmaster) > + pci_set_master(pdev); this is wrong; the driver should KNOW the device is enabled; no reason to check for is_enabled. Same for is_busmaster... - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/