diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/cris/arch-v10/drivers/eeprom.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/cris/arch-v10/drivers/eeprom.c')
| -rw-r--r-- | arch/cris/arch-v10/drivers/eeprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 037582028560..6e1f191a71e3 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c | |||
| @@ -450,9 +450,9 @@ int __init eeprom_init(void) | |||
| 450 | static int eeprom_open(struct inode * inode, struct file * file) | 450 | static int eeprom_open(struct inode * inode, struct file * file) |
| 451 | { | 451 | { |
| 452 | 452 | ||
| 453 | if(MINOR(inode->i_rdev) != EEPROM_MINOR_NR) | 453 | if(iminor(inode) != EEPROM_MINOR_NR) |
| 454 | return -ENXIO; | 454 | return -ENXIO; |
| 455 | if(MAJOR(inode->i_rdev) != EEPROM_MAJOR_NR) | 455 | if(imajor(inode) != EEPROM_MAJOR_NR) |
| 456 | return -ENXIO; | 456 | return -ENXIO; |
| 457 | 457 | ||
| 458 | if( eeprom.size > 0 ) | 458 | if( eeprom.size > 0 ) |