Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39754
b: refs/heads/master
c: 04518bf
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik authored and Linus Torvalds committed Oct 17, 2006
1 parent 7ed6527 commit f7fe579
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 078d396598401dbaa88d5f95ec45579f9d3dce0e
refs/heads/master: 04518bfe8eac2e82b476fb2b0093527adc2bc791
9 changes: 6 additions & 3 deletions trunk/drivers/isdn/i4l/isdn_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1134,9 +1134,12 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
if (dev->drv[drvidx]->interface->readstat) {
if (count > dev->drv[drvidx]->stavail)
count = dev->drv[drvidx]->stavail;
len = dev->drv[drvidx]->interface->
readstat(buf, count, drvidx,
isdn_minor2chan(minor));
len = dev->drv[drvidx]->interface->readstat(buf, count,
drvidx, isdn_minor2chan(minor));
if (len < 0) {
retval = len;
goto out;
}
} else {
len = 0;
}
Expand Down

0 comments on commit f7fe579

Please sign in to comment.