From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 00:35:45 +0000 (+1100)
Subject: Merge remote-tracking branch 's390/features'
X-Git-Tag: next-20140106~91
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e0ae77743581b8000ae2c94f4fb339165367e6f5;p=karo-tx-linux.git

Merge remote-tracking branch 's390/features'
---

e0ae77743581b8000ae2c94f4fb339165367e6f5
diff --cc arch/s390/pci/pci_event.c
index 069607209a30,7fc4c2c5708c..01e251b1da0c
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@@ -99,10 -102,13 +103,14 @@@ static void __zpci_event_availability(s
  
  		break;
  	case 0x0304: /* Configured -> Standby */
- 		if (pdev)
+ 		if (pdev) {
+ 			/* Give the driver a hint that the function is
+ 			 * already unusable. */
+ 			pdev->error_state = pci_channel_io_perm_failure;
  			pci_stop_and_remove_bus_device(pdev);
+ 		}
  
 +		zdev->fh = ccdf->fh;
  		zpci_disable_device(zdev);
  		zdev->state = ZPCI_FN_STATE_STANDBY;
  		break;