projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6' into for-2.6.22
[powerpc.git]
/
drivers
/
infiniband
/
hw
/
ehca
/
ehca_main.c
diff --git
a/drivers/infiniband/hw/ehca/ehca_main.c
b/drivers/infiniband/hw/ehca/ehca_main.c
index
3b23d67
..
4700085
100644
(file)
--- a/
drivers/infiniband/hw/ehca/ehca_main.c
+++ b/
drivers/infiniband/hw/ehca/ehca_main.c
@@
-565,11
+565,11
@@
static int __devinit ehca_probe(struct ibmebus_dev *dev,
const struct of_device_id *id)
{
struct ehca_shca *shca;
const struct of_device_id *id)
{
struct ehca_shca *shca;
- u64 *handle;
+
const
u64 *handle;
struct ib_pd *ibpd;
int ret;
struct ib_pd *ibpd;
int ret;
- handle =
(u64 *)
get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
+ handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
if (!handle) {
ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
dev->ofdev.node->full_name);
if (!handle) {
ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
dev->ofdev.node->full_name);