Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / infiniband / core / device.c

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 4007f72..e711de4 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -627,6 +627,9 @@ int ib_modify_device(struct ib_device *device,
                     int device_modify_mask,
                     struct ib_device_modify *device_modify)
 {
+       if (!device->modify_device)
+               return -ENOSYS;
+
        return device->modify_device(device, device_modify_mask,
                                     device_modify);
 }
@@ -647,6 +650,9 @@ int ib_modify_port(struct ib_device *device,
                   u8 port_num, int port_modify_mask,
                   struct ib_port_modify *port_modify)
 {
+       if (!device->modify_port)
+               return -ENOSYS;
+
        if (port_num < start_port(device) || port_num > end_port(device))
                return -EINVAL;