summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/tegra/host/bus_client.c2
-rw-r--r--include/linux/nvhost_ioctl.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/tegra/host/bus_client.c b/drivers/video/tegra/host/bus_client.c
index 0c65a1cdf89e..2ec0c47e6eee 100644
--- a/drivers/video/tegra/host/bus_client.c
+++ b/drivers/video/tegra/host/bus_client.c
@@ -797,7 +797,7 @@ static long nvhost_channelctl(struct file *filp,
break;
}
- ((struct nvhost_get_param_args *)buf)->value = fd;
+ ((struct nvhost_channel_open_args *)buf)->channel_fd = fd;
break;
}
case NVHOST_IOCTL_CHANNEL_GET_SYNCPOINTS:
diff --git a/include/linux/nvhost_ioctl.h b/include/linux/nvhost_ioctl.h
index 8e1e066cdd5e..d94dbcd19909 100644
--- a/include/linux/nvhost_ioctl.h
+++ b/include/linux/nvhost_ioctl.h
@@ -93,6 +93,10 @@ struct nvhost_get_param_arg {
__u32 value;
};
+struct nvhost_channel_open_args {
+ __s32 channel_fd;
+};
+
struct nvhost_set_nvmap_fd_args {
__u32 fd;
} __packed;
@@ -384,7 +388,7 @@ struct nvhost_set_ctxswitch_args {
#define NVHOST_IOCTL_CHANNEL_SET_ERROR_NOTIFIER \
_IOWR(NVHOST_IOCTL_MAGIC, 111, struct nvhost_set_error_notifier)
#define NVHOST_IOCTL_CHANNEL_OPEN \
- _IOR(NVHOST_IOCTL_MAGIC, 112, struct nvhost_get_param_args)
+ _IOR(NVHOST_IOCTL_MAGIC, 112, struct nvhost_channel_open_args)
#define NVHOST_IOCTL_CHANNEL_LAST \
_IOC_NR(NVHOST_IOCTL_CHANNEL_OPEN)