From 6b983d61ac9688a2b2de1c35bca04913a3b49156 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 20 Jan 2009 15:07:36 +0300 Subject: [PATCH] --- yaml --- r: 141252 b: refs/heads/master c: 2c77cb3e0595dd0c2dfeb548a9474a513d14a74b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/altpciechdma/altpciechdma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f5733f30174..29cb9f9f0c97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 451084d2e056ab9ef0ae6afe59556dadc2f416aa +refs/heads/master: 2c77cb3e0595dd0c2dfeb548a9474a513d14a74b diff --git a/trunk/drivers/staging/altpciechdma/altpciechdma.c b/trunk/drivers/staging/altpciechdma/altpciechdma.c index 3e04a6227826..27059bcc4020 100644 --- a/trunk/drivers/staging/altpciechdma/altpciechdma.c +++ b/trunk/drivers/staging/altpciechdma/altpciechdma.c @@ -946,7 +946,8 @@ static void __devexit remove(struct pci_dev *dev) struct ape_dev *ape; printk(KERN_DEBUG "remove(0x%p)\n", dev); if ((dev == 0) || (dev->dev.driver_data == 0)) { - printk(KERN_DEBUG "remove(dev = 0x%p) dev->dev.driver_data = 0x%p\n", dev, dev->dev.driver_data); + printk(KERN_DEBUG "remove(dev = 0x%p) dev->dev.driver_data = 0x%p\n", + dev, (dev? dev->dev.driver_data: NULL)); return; } ape = (struct ape_dev *)dev->dev.driver_data;