diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
| commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
| tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /drivers/mtd/mtdchar.c | |
| parent | 56965536b8056f57830219efbba4b85218d96d6c (diff) | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/mtd/mtdchar.c')
| -rw-r--r-- | drivers/mtd/mtdchar.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index fb8b4f7e48d3..5b6acfcb2b88 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
| @@ -62,15 +62,12 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig) | |||
| 62 | struct mtd_info *mtd = mfi->mtd; | 62 | struct mtd_info *mtd = mfi->mtd; |
| 63 | 63 | ||
| 64 | switch (orig) { | 64 | switch (orig) { |
| 65 | case 0: | 65 | case SEEK_SET: |
| 66 | /* SEEK_SET */ | ||
| 67 | break; | 66 | break; |
| 68 | case 1: | 67 | case SEEK_CUR: |
| 69 | /* SEEK_CUR */ | ||
| 70 | offset += file->f_pos; | 68 | offset += file->f_pos; |
| 71 | break; | 69 | break; |
| 72 | case 2: | 70 | case SEEK_END: |
| 73 | /* SEEK_END */ | ||
| 74 | offset += mtd->size; | 71 | offset += mtd->size; |
| 75 | break; | 72 | break; |
| 76 | default: | 73 | default: |