diff --git a/[refs] b/[refs] index 8f13a23c7e1c..f6fba0ee9ed3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa8880bece7321d61a7a5e7bf4b67832071ee047 +refs/heads/master: 0e5d61d87b3a1ad5591e0dfbe4c548f862e9f5a6 diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c index b4c194331d8c..10f8ac37cecd 100644 --- a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +++ b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c @@ -53,7 +53,7 @@ void s5p_mfc_release_priv_buf(struct device *dev, { if (b->virt) { dma_free_coherent(dev, b->size, b->virt, b->dma); - b->virt = 0; + b->virt = NULL; b->dma = 0; b->size = 0; }