Merge branch 'clk-next' into v4.3-rc1

[firefly-linux-kernel-4.4.55.git] / drivers / media / radio / radio-sf16fmi.c

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index d7ce8fe6b5ae1a89c5c578a9f2d88d20aaeecca7..28a89466cddc4a82985a6ab01785c093fa8c91ff 100644 (file)
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -56,7 +56,7 @@ struct fmi
 
 static struct fmi fmi_card;
 static struct pnp_dev *dev;
-bool pnp_attached;
+static bool pnp_attached;
 
 #define RSF16_MINFREQ (87U * 16000)
 #define RSF16_MAXFREQ (108U * 16000)
@@ -285,7 +285,7 @@ static int __init fmi_init(void)
                                io = isapnp_fmi_probe();
                                if (io < 0)
                                        continue;
-                               pnp_attached = 1;
+                               pnp_attached = true;
                        }
                        if (!request_region(io, 2, "radio-sf16fmi")) {
                                if (pnp_attached)
@@ -349,7 +349,7 @@ static int __init fmi_init(void)
        mutex_init(&fmi->lock);
 
        /* mute card and set default frequency */
-       fmi->mute = 1;
+       fmi->mute = true;
        fmi->curfreq = RSF16_MINFREQ;
        fmi_set_freq(fmi);