diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /drivers/isdn/i4l/isdn_ttyfax.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/i4l/isdn_ttyfax.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ttyfax.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c index f93de4a30355..78f7660c1d0e 100644 --- a/drivers/isdn/i4l/isdn_ttyfax.c +++ b/drivers/isdn/i4l/isdn_ttyfax.c | |||
| @@ -906,7 +906,8 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info) | |||
| 906 | sprintf(rs, "\r\n0-2"); | 906 | sprintf(rs, "\r\n0-2"); |
| 907 | isdn_tty_at_cout(rs, info); | 907 | isdn_tty_at_cout(rs, info); |
| 908 | } else { | 908 | } else { |
| 909 | if ((f->phase != ISDN_FAX_PHASE_D) || (!info->faxonline & 1)) | 909 | if ((f->phase != ISDN_FAX_PHASE_D) || |
| 910 | (!(info->faxonline & 1))) | ||
| 910 | PARSE_ERROR1; | 911 | PARSE_ERROR1; |
| 911 | par = isdn_getnum(p); | 912 | par = isdn_getnum(p); |
| 912 | if ((par < 0) || (par > 2)) | 913 | if ((par < 0) || (par > 2)) |