V4L/DVB (7513): media/dvb/dvb-usb replace remaining __FUNCTION__ occurrences

[linux-2.6-block.git] / drivers / media / dvb / frontends / xc5000.c

diff --git a/drivers/media/dvb/frontends/xc5000.c b/drivers/media/dvb/frontends/xc5000.c
index a13027e09cdac59b50196bcca373b7faccf7fae5..a5094b7f21fd030eac3a9a533ee15b70f1f56219 100644 (file)
--- a/drivers/media/dvb/frontends/xc5000.c
+++ b/drivers/media/dvb/frontends/xc5000.c
@@ -151,7 +151,7 @@ typedef struct {
 #define FM_Radio_INPUT2        21
 #define FM_Radio_INPUT1        22
 
-XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
+static XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
        {"M/N-NTSC/PAL-BTSC", 0x0400, 0x8020},
        {"M/N-NTSC/PAL-A2",   0x0600, 0x8020},
        {"M/N-NTSC/PAL-EIAJ", 0x0440, 0x8020},
@@ -558,6 +558,7 @@ static int xc5000_fwupload(struct dvb_frontend* fe)
        if (ret) {
                printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n");
                ret = XC_RESULT_RESET_FAILURE;
+               goto out;
        } else {
                printk(KERN_INFO "xc5000: firmware read %Zu bytes.\n",
                       fw->size);
@@ -572,6 +573,7 @@ static int xc5000_fwupload(struct dvb_frontend* fe)
                ret = xc_load_i2c_sequence(fe,  fw->data );
        }
 
+out:
        release_firmware(fw);
        return ret;
 }