diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:09:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:09:24 -0700 |
| commit | 60efec8e05c9fb71841c7587c55345c4b79d1856 (patch) | |
| tree | dcc23d4f2dcf6da6445f3fc688e2a1ad29bc0351 /drivers | |
| parent | 79bd9937a72837bcc12db89d2d4fc62795227892 (diff) | |
| parent | 3dc527ecfb95dcb5760bd2b339323518496d53eb (diff) | |
| download | history-60efec8e05c9fb71841c7587c55345c4b79d1856.tar.gz | |
Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
into kernel.bkbits.net:/home/davem/sparc-2.6
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 | ||||
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_demux.c | 2 |
4 files changed, 5 insertions, 5 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); diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c index e35059511941be..657d5579b16b6e 100644 --- a/drivers/media/dvb/dvb-core/dvb_demux.c +++ b/drivers/media/dvb/dvb-core/dvb_demux.c @@ -179,7 +179,7 @@ static int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed, neq |= f->maskandnotmode[i] & xor; } - if (f->doneq & !neq) + if (f->doneq && !neq) return 0; return feed->cb.sec (feed->feed.sec.secbuf, feed->feed.sec.seclen, |