[mthca] Fix a build break. [mlnx: 4411]

[mirror/winof/.git] / hw / mthca / kernel / mt_device.c

diff --git a/hw/mthca/kernel/mt_device.c b/hw/mthca/kernel/mt_device.c
index 9350458..883c986 100644 (file)
--- a/hw/mthca/kernel/mt_device.c
+++ b/hw/mthca/kernel/mt_device.c
@@ -140,16 +140,18 @@ static int alloc_name(char *name)
                        continue;
                if (i < 0 || i >= PAGE_SIZE * 8)
                        continue;
                        continue;
                if (i < 0 || i >= PAGE_SIZE * 8)
                        continue;

-               snprintf(buf, sizeof(buf)-1, name, i);
-               buf[sizeof(buf)-1] = '\0';
+               if (RtlStringCbPrintfA(buf, sizeof buf, name, i))
+                       return -EINVAL;
+

                if (!strncmp(buf, device->name, IB_DEVICE_NAME_MAX))
                        set_bit(i, inuse);
        }
 
        i = find_first_zero_bit((const unsigned long *)inuse, PAGE_SIZE * 8);
        free_page(inuse);
                if (!strncmp(buf, device->name, IB_DEVICE_NAME_MAX))
                        set_bit(i, inuse);
        }
 
        i = find_first_zero_bit((const unsigned long *)inuse, PAGE_SIZE * 8);
        free_page(inuse);

-       snprintf(buf, sizeof(buf)-1, name, i);
-       buf[sizeof(buf)-1] = '\0';
+       if (RtlStringCbPrintfA(buf, sizeof buf, name, i))
+                       return -EINVAL;
+

 
        if (__ib_device_get_by_name(buf))
                return -ENFILE;
 
        if (__ib_device_get_by_name(buf))
                return -ENFILE;


@@ -499,7 +501,7 @@ int ib_query_gid_chunk(struct ib_device *device,
  * ib_query_pkey_chunk() fetches the specified P_Key table entries chunk.
  */
 int ib_query_pkey_chunk(struct ib_device *device,
  * ib_query_pkey_chunk() fetches the specified P_Key table entries chunk.
  */
 int ib_query_pkey_chunk(struct ib_device *device,

-                 u8 port_num, u16 index, u16 pkey[32])
+                 u8 port_num, u16 index, __be16 pkey[32])

 {
        return device->query_pkey_chunk(device, port_num, index, pkey);
 }
 {
        return device->query_pkey_chunk(device, port_num, index, pkey);
 }