Re: Fix suspend/resume on via-velocity

[Jeff Garzik]

Pavel Machek wrote:
> Hi!
>
> This fixes suspend-resume on via-velocity. It was confused
> w.r.t. pointers... Please apply,
>
> Signed-off-by: Pavel Machek <pavel@xxxxxxx>
> 							Pavel
>
> --- clean-mm/drivers/net/via-velocity.c	2005-03-11 11:25:36.000000000 +0100
> +++ linux/drivers/net/via-velocity.c	2005-03-11 10:06:05.000000000 +0100
> @@ -3212,7 +3212,8 @@
>  
>  static int velocity_suspend(struct pci_dev *pdev, pm_message_t state)
>  {
> -	struct velocity_info *vptr = pci_get_drvdata(pdev);
> +	struct net_device *dev = pci_get_drvdata(pdev);
> +	struct velocity_info *vptr = dev->priv;
>  	unsigned long flags;
>  
>  	if(!netif_running(vptr->dev))
> @@ -3245,7 +3246,8 @@
>  
>  static int velocity_resume(struct pci_dev *pdev)
>  {
> -	struct velocity_info *vptr = pci_get_drvdata(pdev);
> +	struct net_device *dev = pci_get_drvdata(pdev);
> +	struct velocity_info *vptr = dev->priv;

Please use netdev_priv() rather than 'dev->priv', to eliminate a 
dereference.

	Jeff



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/