git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
cris
/
arch-v10
/
drivers
/
eeprom.c
diff --git
a/arch/cris/arch-v10/drivers/eeprom.c
b/arch/cris/arch-v10/drivers/eeprom.c
index
0375820
..
6e1f191
100644
(file)
--- 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)
static int eeprom_open(struct inode * inode, struct file * file)
{
static int eeprom_open(struct inode * inode, struct file * file)
{
- if(
MINOR(inode->i_rdev
) != EEPROM_MINOR_NR)
+ if(
iminor(inode
) != EEPROM_MINOR_NR)
return -ENXIO;
return -ENXIO;
- if(
MAJOR(inode->i_rdev
) != EEPROM_MAJOR_NR)
+ if(
imajor(inode
) != EEPROM_MAJOR_NR)
return -ENXIO;
if( eeprom.size > 0 )
return -ENXIO;
if( eeprom.size > 0 )