diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-09 03:23:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-09 03:23:30 -0700 |
| commit | e6380f1c5eb823edeaadd7d4e2a7562b0bdec49a (patch) | |
| tree | f9736929b6189a3f3041ebe14d902283f4747bae /drivers | |
| parent | 799e4907a6c5004c7f113df7ea1e2e86e27a3e62 (diff) | |
| download | history-e6380f1c5eb823edeaadd7d4e2a7562b0bdec49a.tar.gz | |
Fix up drivers that access file->f_pos directly.
Use the proper "pointer to pos" that is passed down instead.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/sleep/proc.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/divert/divert_procfs.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_proclog.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index a64ef154db0808..7eb20609694e91 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c @@ -345,7 +345,7 @@ acpi_system_write_alarm ( acpi_set_register(ACPI_BITREG_RT_CLOCK_ENABLE, 1, ACPI_MTX_LOCK); - file->f_pos += count; + *ppos += count; result = 0; end: diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c index d89a94b964cb98..d3506ee8543d51 100644 --- a/drivers/isdn/divert/divert_procfs.c +++ b/drivers/isdn/divert/divert_procfs.c @@ -94,7 +94,7 @@ isdn_divert_read(struct file *file, char *buf, size_t count, loff_t * off) if ((len = strlen(inf->info_start)) <= count) { if (copy_to_user(buf, inf->info_start, len)) return -EFAULT; - file->f_pos += len; + *off += len; return (len); } return (0); @@ -142,7 +142,7 @@ isdn_divert_open(struct inode *ino, struct file *filep) (struct divert_info **) filep->private_data = &divert_info_head; spin_unlock_irqrestore( &divert_info_lock, flags ); /* start_divert(); */ - return (0); + return nonseekable_open(ino, filep); } /* isdn_divert_open */ /*******************/ diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c index a5477cc4eaf521..8ef2b7c952a67d 100644 --- a/drivers/isdn/hysdn/hysdn_proclog.c +++ b/drivers/isdn/hysdn/hysdn_proclog.c @@ -234,7 +234,7 @@ hysdn_log_read(struct file *file, char __user *buf, size_t count, loff_t * off) if ((len = strlen(inf->log_start)) <= count) { if (copy_to_user(buf, inf->log_start, len)) return -EFAULT; - file->f_pos += len; + *off += len; return (len); } return (0); |