linux-kernel - Re: [PATCH 1/5] e1000e: fix resuming from runtime-suspend

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 28 Jan 2013 16:05:33 -0700
From:	Bjorn Helgaas <bhelgaas@...gle.com>
To:	Konstantin Khlebnikov <khlebnikov@...nvz.org>
Cc:	linux-kernel@...r.kernel.org, e1000-devel@...ts.sourceforge.net,
	linux-pci@...r.kernel.org, Bruce Allan <bruce.w.allan@...el.com>,
	Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Subject: Re: [PATCH 1/5] e1000e: fix resuming from runtime-suspend

[+cc Rafael, author of patch you cited]

On Fri, Jan 18, 2013 at 4:42 AM, Konstantin Khlebnikov
<khlebnikov@...nvz.org> wrote:
> Bug was introduced in commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133
> ("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") in v2.6.35
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@...nvz.org>
> Cc: e1000-devel@...ts.sourceforge.net
> Cc: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> Cc: Bruce Allan <bruce.w.allan@...el.com>
> ---
>  drivers/net/ethernet/intel/e1000e/netdev.c |   13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index fbf75fd..2853c11 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5691,14 +5691,17 @@ static int e1000_runtime_suspend(struct device *dev)
>         struct pci_dev *pdev = to_pci_dev(dev);
>         struct net_device *netdev = pci_get_drvdata(pdev);
>         struct e1000_adapter *adapter = netdev_priv(netdev);
> +       int retval;
> +       bool wake;
>
> -       if (e1000e_pm_ready(adapter)) {
> -               bool wake;
> +       if (!e1000e_pm_ready(adapter))
> +               return 0;
>
> -               __e1000_shutdown(pdev, &wake, true);
> -       }
> +       retval = __e1000_shutdown(pdev, &wake, true);
> +       if (!retval)
> +               e1000_power_off(pdev, true, wake);
>
> -       return 0;
> +       return retval;
>  }
>
>  static int e1000_idle(struct device *dev)
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/