2008-12-01 07:31:25

by Hidetoshi Seto

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 <[email protected]>
---
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

2008-12-01 07:58:49

by Zhang, Yanmin

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

Acked.

Nice capture.

Yanmin

>>-----Original Message-----
>>From: Hidetoshi Seto [mailto:[email protected]]
>>Sent: Monday, December 01, 2008 3:31 PM
>>To: [email protected]; Nguyen, Tom L; Zhang, Yanmin
>>Cc: [email protected]
>>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 <[email protected]>
>>---
>> 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
>>

2008-12-16 18:33:50

by Jesse Barnes

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

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 <[email protected]>
> ---
> 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

2009-01-05 21:03:38

by Jesse Barnes

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

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 <[email protected]>
> ---
> 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

2009-01-05 21:29:25

by Jesse Barnes

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

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 <[email protected]>
> > ---
> > 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