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 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
drivers
/
block
/
ataflop.c
diff --git
a/drivers/block/ataflop.c
b/drivers/block/ataflop.c
index
f5e7180
..
3ff0294
100644
(file)
--- a/
drivers/block/ataflop.c
+++ b/
drivers/block/ataflop.c
@@
-1627,7
+1627,7
@@
static int fd_ioctl(struct block_device *bdev, fmode_t mode,
drive, dtp->blocks, dtp->spt, dtp->stretch);
/* sanity check */
- if (
!dtp ||
setprm.track != dtp->blocks/dtp->spt/2 ||
+ if (setprm.track != dtp->blocks/dtp->spt/2 ||
setprm.head != 2) {
redo_fd_request();
return -EINVAL;