diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/cris/arch-v32/drivers/cryptocop.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/cris/arch-v32/drivers/cryptocop.c')
| -rw-r--r-- | arch/cris/arch-v32/drivers/cryptocop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index c59ee28a35f4..ba096ebb0b15 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c | |||
| @@ -2302,7 +2302,7 @@ static int cryptocop_job_setup(struct cryptocop_prio_job **pj, struct cryptocop_ | |||
| 2302 | 2302 | ||
| 2303 | static int cryptocop_open(struct inode *inode, struct file *filp) | 2303 | static int cryptocop_open(struct inode *inode, struct file *filp) |
| 2304 | { | 2304 | { |
| 2305 | int p = MINOR(inode->i_rdev); | 2305 | int p = iminor(inode); |
| 2306 | 2306 | ||
| 2307 | if (p != CRYPTOCOP_MINOR) return -EINVAL; | 2307 | if (p != CRYPTOCOP_MINOR) return -EINVAL; |
| 2308 | 2308 | ||