diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/media/radio/radio-sf16fmi.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/media/radio/radio-sf16fmi.c')
| -rw-r--r-- | drivers/media/radio/radio-sf16fmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 3118bdab3183..53e114857377 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
| @@ -361,6 +361,7 @@ static int __init fmi_init(void) | |||
| 361 | } | 361 | } |
| 362 | if (!request_region(io, 2, "radio-sf16fmi")) { | 362 | if (!request_region(io, 2, "radio-sf16fmi")) { |
| 363 | printk(KERN_ERR "radio-sf16fmi: port 0x%x already in use\n", io); | 363 | printk(KERN_ERR "radio-sf16fmi: port 0x%x already in use\n", io); |
| 364 | pnp_device_detach(dev); | ||
| 364 | return -EBUSY; | 365 | return -EBUSY; |
| 365 | } | 366 | } |
| 366 | 367 | ||