From 137e22c8204066ddbe789bdf613883902ae0323f Mon Sep 17 00:00:00 2001
From: Tomoya <tomoya-linux@dsn.okisemi.com>
Date: Mon, 7 Feb 2011 23:29:03 +0000
Subject: [PATCH] --- yaml --- r: 233089 b: refs/heads/master c:
 c69b90920a36b88ab0d649963d81355d865eeb05 h: refs/heads/master i:   233087:
 c1ce728dead9be1cb4429a950cdd4e8dbc040e68 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/can/pch_can.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 873755a75197..b1e9dd163dde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce9736d4fb48beed370e22ac156779746dda7b92
+refs/heads/master: c69b90920a36b88ab0d649963d81355d865eeb05
diff --git a/trunk/drivers/net/can/pch_can.c b/trunk/drivers/net/can/pch_can.c
index 342d514c5e84..7d8bc128044c 100644
--- a/trunk/drivers/net/can/pch_can.c
+++ b/trunk/drivers/net/can/pch_can.c
@@ -1238,6 +1238,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
 		priv->use_msi = 0;
 	} else {
 		netdev_err(ndev, "PCH CAN opened with MSI\n");
+		pci_set_master(pdev);
 		priv->use_msi = 1;
 	}