Skip to contentSkip to conversation

aerdrv: fix sanity check in report_resume

PATCH Applied Hidetoshi Seto 3 participants 5 messages Dec 1, 2008 – Jan 5, 2009 PCI

lore
Share & tools
lore

Hidetoshi Seto

author
#0 lore raw

PATCH 1/1 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(-)
drivers/pci/pcie/aer/aerdrv_core.c +1 -1
index dfc63d0..aac7006 100644
@@ -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;
Signature · 1 line
1.6.0
#1 lore raw

Acked.

Nice capture.

Yanmin

Quoted 32 lines
Quoted 32 lines

-----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(-)
drivers/pci/pcie/aer/aerdrv_core.c +1 -2
index dfc63d0..aac7006 100644
@@ -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

Applied
#2 lore raw
In reply to Hidetoshi Seto
Quoted 21 lines · 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 <[email protected]>
---
 drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d0..aac7006 100644

drivers/pci/pcie/aer/aerdrv_core.c +1 -1
@@ -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;
Quoted 1 line

err_handler = dev->driver->err_handler;

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

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#3 lore raw
In reply to Hidetoshi Seto
Quoted 21 lines · 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 <[email protected]>
---
 drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d0..aac7006 100644

drivers/pci/pcie/aer/aerdrv_core.c +1 -1
@@ -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;
Quoted 1 line

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.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#4 lore raw
Quoted 22 lines · Jesse Barnes
Quoted 21 lines · 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 <[email protected]>
---
 drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d0..aac7006 100644

drivers/pci/pcie/aer/aerdrv_core.c +1 -1
@@ -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;
Quoted 4 lines
Quoted 1 line

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. :)

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center