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 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[pandora-kernel.git]
/
drivers
/
ide
/
ide-ioctls.c
diff --git
a/drivers/ide/ide-ioctls.c
b/drivers/ide/ide-ioctls.c
index
28232c6
..
1be263e
100644
(file)
--- a/
drivers/ide/ide-ioctls.c
+++ b/
drivers/ide/ide-ioctls.c
@@
-95,8
+95,7
@@
static int ide_set_nice_ioctl(ide_drive_t *drive, unsigned long arg)
return -EPERM;
if (((arg >> IDE_NICE_DSC_OVERLAP) & 1) &&
- (drive->media != ide_tape ||
- (drive->dev_flags & IDE_DFLAG_SCSI)))
+ (drive->media != ide_tape))
return -EPERM;
if ((arg >> IDE_NICE_DSC_OVERLAP) & 1)