diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/media/radio/radio-cadet.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/media/radio/radio-cadet.c')
| -rw-r--r-- | drivers/media/radio/radio-cadet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 022913da8c59..9b0406318f2d 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
| @@ -543,7 +543,7 @@ static int cadet_probe(void) | |||
| 543 | 543 | ||
| 544 | for(i=0;i<8;i++) { | 544 | for(i=0;i<8;i++) { |
| 545 | io=iovals[i]; | 545 | io=iovals[i]; |
| 546 | if(request_region(io,2, "cadet-probe")>=0) { | 546 | if (request_region(io, 2, "cadet-probe")) { |
| 547 | cadet_setfreq(1410); | 547 | cadet_setfreq(1410); |
| 548 | if(cadet_getfreq()==1410) { | 548 | if(cadet_getfreq()==1410) { |
| 549 | release_region(io, 2); | 549 | release_region(io, 2); |