summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lasi700.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-03-24 10:52:46 +1100
committerJames Morris <jmorris@namei.org>2009-03-24 10:52:46 +1100
commit703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch)
tree3e943755178ff410694722bb031f523136fbc432 /drivers/scsi/lasi700.c
parentdf7f54c012b92ec93d56b68547351dcdf8a163d3 (diff)
parent8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff)
downloadop-kernel-dev-703a3cd72817e99201cef84a8a7aecc60b2b3581.zip
op-kernel-dev-703a3cd72817e99201cef84a8a7aecc60b2b3581.tar.gz
Merge branch 'master' into next
Diffstat (limited to 'drivers/scsi/lasi700.c')
-rw-r--r--drivers/scsi/lasi700.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 4a4e695..f23c4ca 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -103,7 +103,7 @@ lasi700_probe(struct parisc_device *dev)
hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
if (!hostdata) {
- dev_printk(KERN_ERR, dev, "Failed to allocate host data\n");
+ dev_printk(KERN_ERR, &dev->dev, "Failed to allocate host data\n");
return -ENOMEM;
}
OpenPOWER on IntegriCloud