git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
mesh.c
diff --git
a/drivers/scsi/mesh.c
b/drivers/scsi/mesh.c
index 6f50a5b3e4ce7c480777a3b9a9e55691d2c9afed..e64d1a19d8d7e0f771fb235cc11bb7dbcdb42359 100644
(file)
--- a/
drivers/scsi/mesh.c
+++ b/
drivers/scsi/mesh.c
@@
-1947,7
+1947,7
@@
static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
ms->tgts[tgt].current_req = NULL;
}
ms->tgts[tgt].current_req = NULL;
}
- if ((cfp = get_property(mesh, "clock-frequency", NULL)))
+ if ((cfp =
of_
get_property(mesh, "clock-frequency", NULL)))
ms->clk_freq = *cfp;
else {
printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
ms->clk_freq = *cfp;
else {
printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");