Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ static int vc_sm_dma_buf_attach(struct dma_buf *dmabuf,
ret = sg_alloc_table(sgt, buf->alloc.sg_table->orig_nents, GFP_KERNEL);
if (ret) {
kfree(a);
mutex_unlock(&buf->lock);
return -ENOMEM;
}

Expand Down Expand Up @@ -1223,7 +1224,7 @@ static int vc_sm_cma_ioctl_alloc(struct vc_sm_privdata_t *private,
dma_buf_put(dmabuf);
} else {
/* No dmabuf, therefore just free the buffer here */
if (buffer->cookie)
if (buffer && buffer->cookie)
dma_free_coherent(&sm_state->device->dev, buffer->size,
buffer->cookie, buffer->dma_addr);
kfree(buffer);
Expand Down
Loading