Pull video into test branch

[linux-drm-fsl-dcu.git] / arch / cris / arch-v32 / drivers / cryptocop.c

diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index 501fa52d8d3a1974285b1d8c1d0e9e73444f9f37..2449637e6fc0ab1bad494dbec05de816f2c12d74 100644 (file)
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -2051,7 +2051,6 @@ static void cryptocop_job_queue_close(void)
        spin_lock_irqsave(&cryptocop_process_lock, process_flags);
 
        /* Empty the job queue. */
-       spin_lock_irqsave(&cryptocop_process_lock, process_flags);
        for (i = 0; i < cryptocop_prio_no_prios; i++){
                if (!list_empty(&(cryptocop_job_queues[i].jobs))){
                        list_for_each_safe(node, tmp, &(cryptocop_job_queues[i].jobs)) {
@@ -2302,7 +2301,7 @@ static int cryptocop_job_setup(struct cryptocop_prio_job **pj, struct cryptocop_
 
 static int cryptocop_open(struct inode *inode, struct file *filp)
 {
-       int p = MINOR(inode->i_rdev);
+       int p = iminor(inode);
 
        if (p != CRYPTOCOP_MINOR) return -EINVAL;
 
@@ -2944,7 +2943,7 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig
                int spdl_err;
                /* Mark output pages dirty. */
                spdl_err = set_page_dirty_lock(outpages[i]);
-               DEBUG(if (spdl_err)printk("cryptocop_ioctl_process: set_page_dirty_lock returned %d\n", spdl_err));
+               DEBUG(if (spdl_err < 0)printk("cryptocop_ioctl_process: set_page_dirty_lock returned %d\n", spdl_err));
        }
        for (i = 0; i < nooutpages; i++){
                put_page(outpages[i]);