diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
| commit | 28638ea4f8adb63f837e4436560ab16ab0388587 (patch) | |
| tree | 2dab7a03d7696697c82ba62a03700d3a2f3639b1 /drivers/media/common/tuners/tea5761.c | |
| parent | f781b03c4b1c713ac000877c8bbc31fc4164a29b (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
Diffstat (limited to 'drivers/media/common/tuners/tea5761.c')
| -rw-r--r-- | drivers/media/common/tuners/tea5761.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/common/tuners/tea5761.c index b93cdef9ac73..b23dadeecd05 100644 --- a/drivers/media/common/tuners/tea5761.c +++ b/drivers/media/common/tuners/tea5761.c | |||
| @@ -295,7 +295,7 @@ struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe, | |||
| 295 | { | 295 | { |
| 296 | struct tea5761_priv *priv = NULL; | 296 | struct tea5761_priv *priv = NULL; |
| 297 | 297 | ||
| 298 | if (tea5761_autodetection(i2c_adap, i2c_addr) == EINVAL) | 298 | if (tea5761_autodetection(i2c_adap, i2c_addr) != 0) |
| 299 | return NULL; | 299 | return NULL; |
| 300 | 300 | ||
| 301 | priv = kzalloc(sizeof(struct tea5761_priv), GFP_KERNEL); | 301 | priv = kzalloc(sizeof(struct tea5761_priv), GFP_KERNEL); |