From 401b5e666842af243532715ef11a2decefefbeb2 Mon Sep 17 00:00:00 2001
From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Date: Wed, 23 May 2012 15:54:44 +0200
Subject: [PATCH] --- yaml --- r: 317218 b: refs/heads/master c:
 786d986ea25632e3d8e7ad5ac2780861ff2b654f h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/ipack/bridges/tpci200.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd1a9d3affef..8da0c185825d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ad0c486a4e702fa059ea24c2585c416f01f4664
+refs/heads/master: 786d986ea25632e3d8e7ad5ac2780861ff2b654f
diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c
index 0c2a50a1ec00..ee26d9a7e370 100644
--- a/trunk/drivers/staging/ipack/bridges/tpci200.c
+++ b/trunk/drivers/staging/ipack/bridges/tpci200.c
@@ -764,6 +764,8 @@ static int tpci200_request_irq(struct ipack_device *dev, int vector,
 static void tpci200_slot_remove(struct tpci200_slot *slot)
 {
 	if ((slot->dev == NULL) ||
+	    (slot->dev->driver == NULL) ||
+	    (slot->dev->driver->ops == NULL) ||
 	    (slot->dev->driver->ops->remove == NULL))
 		return;