Merge tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / Documentation / mic / mpssd / mpssd.c

diff --git a/Documentation/mic/mpssd/mpssd.c b/Documentation/mic/mpssd/mpssd.c
index aaeafa18d99bb70bee8cf5bd1d39829b17d6d3d4..30fb842a976d3ed3b9b9e1cb0bf5e1f64640dcc4 100644 (file)
--- a/Documentation/mic/mpssd/mpssd.c
+++ b/Documentation/mic/mpssd/mpssd.c
@@ -349,7 +349,7 @@ static ssize_t
 sum_iovec_len(struct mic_copy_desc *copy)
 {
        ssize_t sum = 0;
-       int i;
+       unsigned int i;
 
        for (i = 0; i < copy->iovcnt; i++)
                sum += copy->iov[i].iov_len;
@@ -372,7 +372,7 @@ static void
 disp_iovec(struct mic_info *mic, struct mic_copy_desc *copy,
           const char *s, int line)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < copy->iovcnt; i++)
                mpsslog("%s %s %d copy->iov[%d] addr %p len 0x%zx\n",
@@ -926,7 +926,7 @@ add_virtio_device(struct mic_info *mic, struct mic_device_desc *dd)
        char path[PATH_MAX];
        int fd, err;
 
-       snprintf(path, PATH_MAX, "/dev/mic%d", mic->id);
+       snprintf(path, PATH_MAX, "/dev/vop_virtio%d", mic->id);
        fd = open(path, O_RDWR);
        if (fd < 0) {
                mpsslog("Could not open %s %s\n", path, strerror(errno));