diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/isdn/i4l/isdn_v110.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/isdn/i4l/isdn_v110.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_v110.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c index f47f2b9846d8..38619e8cd823 100644 --- a/drivers/isdn/i4l/isdn_v110.c +++ b/drivers/isdn/i4l/isdn_v110.c | |||
| @@ -516,11 +516,11 @@ buffer_full: | |||
| 516 | } | 516 | } |
| 517 | 517 | ||
| 518 | int | 518 | int |
| 519 | isdn_v110_stat_callback(int idx, isdn_ctrl * c) | 519 | isdn_v110_stat_callback(int idx, isdn_ctrl *c) |
| 520 | { | 520 | { |
| 521 | isdn_v110_stream *v = NULL; | 521 | isdn_v110_stream *v = NULL; |
| 522 | int i; | 522 | int i; |
| 523 | int ret; | 523 | int ret = 0; |
| 524 | 524 | ||
| 525 | if (idx < 0) | 525 | if (idx < 0) |
| 526 | return 0; | 526 | return 0; |