[PATCH] aerdrv: fix sanity check in report_resume

[PATCH] aerdrv: fix sanity check in report_resume

[Hidetoshi Seto]

What we have to check here before calling it is err_handler->resume.
It seems that this block have been copy&pasted from report_slot_reset.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
---
 drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index dfc63d0..aac7006 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void *data)
 
 	if (!dev->driver ||
 		!dev->driver->err_handler ||
-		!dev->driver->err_handler->slot_reset)
+		!dev->driver->err_handler->resume)
 		return;
 
 	err_handler = dev->driver->err_handler;
-- 
1.6.0

RE: [PATCH] aerdrv: fix sanity check in report_resume

[Zhang, Yanmin]

Acked.

Nice capture.

Yanmin

>>-----Original Message-----
>>From: Hidetoshi Seto [mailto:seto.hidetoshi@jp.fujitsu.com]
>>Sent: Monday, December 01, 2008 3:31 PM
>>To: linux-pci@vger.kernel.org; Nguyen, Tom L; Zhang, Yanmin
>>Cc: linux-kernel@vger.kernel.org
>>Subject: [PATCH] aerdrv: fix sanity check in report_resume
>>
>>What we have to check here before calling it is err_handler->resume.
>>It seems that this block have been copy&pasted from report_slot_reset.
>>
>>Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
>>---
>> drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>>diff --git a/drivers/pci/pcie/aer/aerdrv_core.c
>>b/drivers/pci/pcie/aer/aerdrv_core.c
>>index dfc63d0..aac7006 100644
>>--- a/drivers/pci/pcie/aer/aerdrv_core.c
>>+++ b/drivers/pci/pcie/aer/aerdrv_core.c
>>@@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void *data)
>>
>> 	if (!dev->driver ||
>> 		!dev->driver->err_handler ||
>>-		!dev->driver->err_handler->slot_reset)
>>+		!dev->driver->err_handler->resume)
>> 		return;
>>
>> 	err_handler = dev->driver->err_handler;
>>--
>>1.6.0
>>

Re: [PATCH] aerdrv: fix sanity check in report_resume

[Jesse Barnes]

On Sunday, November 30, 2008 11:31 pm Hidetoshi Seto wrote:
> What we have to check here before calling it is err_handler->resume.
> It seems that this block have been copy&pasted from report_slot_reset.
>
> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
> ---
>  drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer/aerdrv_core.c
> b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d0..aac7006 100644
> --- a/drivers/pci/pcie/aer/aerdrv_core.c
> +++ b/drivers/pci/pcie/aer/aerdrv_core.c
> @@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void
> *data)
>
>  	if (!dev->driver ||
>  		!dev->driver->err_handler ||
> -		!dev->driver->err_handler->slot_reset)
> +		!dev->driver->err_handler->resume)
>  		return;
>
>  	err_handler = dev->driver->err_handler;

Applied this to my for-linus branch with Yanmin's ack, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH] aerdrv: fix sanity check in report_resume

[Jesse Barnes]

On Sunday, November 30, 2008 11:31 pm Hidetoshi Seto wrote:
> What we have to check here before calling it is err_handler->resume.
> It seems that this block have been copy&pasted from report_slot_reset.
>
> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
> ---
>  drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer/aerdrv_core.c
> b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d0..aac7006 100644
> --- a/drivers/pci/pcie/aer/aerdrv_core.c
> +++ b/drivers/pci/pcie/aer/aerdrv_core.c
> @@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void
> *data)
>
>  	if (!dev->driver ||
>  		!dev->driver->err_handler ||
> -		!dev->driver->err_handler->slot_reset)
> +		!dev->driver->err_handler->resume)
>  		return;
>
>  	err_handler = dev->driver->err_handler;

Applied (again).  Hope it doesn't get lost again between now & when I send the 
pull.  Sorry about that.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH] aerdrv: fix sanity check in report_resume

[Jesse Barnes]

On Monday, January 5, 2009 1:03 pm Jesse Barnes wrote:
> On Sunday, November 30, 2008 11:31 pm Hidetoshi Seto wrote:
> > What we have to check here before calling it is err_handler->resume.
> > It seems that this block have been copy&pasted from report_slot_reset.
> >
> > Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
> > ---
> >  drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/pci/pcie/aer/aerdrv_core.c
> > b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d0..aac7006 100644
> > --- a/drivers/pci/pcie/aer/aerdrv_core.c
> > +++ b/drivers/pci/pcie/aer/aerdrv_core.c
> > @@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void
> > *data)
> >
> >  	if (!dev->driver ||
> >  		!dev->driver->err_handler ||
> > -		!dev->driver->err_handler->slot_reset)
> > +		!dev->driver->err_handler->resume)
> >  		return;
> >
> >  	err_handler = dev->driver->err_handler;
>
> Applied (again).  Hope it doesn't get lost again between now & when I send
> the pull.  Sorry about that.

Ah nm, I see it went through my for-linus branch, so it appears to be upstream 
already.... Phew.  I'm still lossy but not as lossy as I thought I was. :)

-- 
Jesse Barnes, Intel Open Source Technology Center