diff --git a/[refs] b/[refs] index c974a637f7ba..e0217cd46049 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33fa1d909c7357be715aa0e9f9e24c3ef5714493 +refs/heads/master: 78e2c6415a50646896d75dedf9f71e54081311fa diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c index 9c5c66d16a23..65eb8929db22 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c @@ -2055,7 +2055,7 @@ static int ipath_close(struct inode *in, struct file *fp) mutex_lock(&ipath_mutex); - fd = (struct ipath_filedata *) fp->private_data; + fd = fp->private_data; fp->private_data = NULL; pd = fd->pd; if (!pd) {