From a28b68bd60735c44b3a028bcfb275addfb9fbf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Tue, 11 Sep 2012 13:35:06 +0200 Subject: [PATCH] --- yaml --- r: 325174 b: refs/heads/master c: 7273b88ebfc1b3ea5387e37fae8b1d77e59e169f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 362054a78069..bbe7b89ab590 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b442bf738454d5eeaf695e45051e9fa7242bb9a3 +refs/heads/master: 7273b88ebfc1b3ea5387e37fae8b1d77e59e169f diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index b92814067061..77e6392fee08 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -385,7 +385,6 @@ static int tpci200_slot_unregister(struct ipack_device *dev) return -ERESTARTSYS; tpci200->slots[dev->slot].dev = NULL; - ipack_device_unregister(dev); mutex_unlock(&tpci200->mutex); return 0; @@ -614,7 +613,7 @@ static void tpci200_uninstall(struct tpci200_board *tpci200) int i; for (i = 0; i < TPCI200_NB_SLOT; i++) - tpci200_slot_unregister(tpci200->slots[i].dev); + ipack_device_unregister(tpci200->slots[i].dev); tpci200_unregister(tpci200); kfree(tpci200->slots);