From: Johannes Stezenbach clarify firmware upload messages Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton --- 25-akpm/drivers/media/dvb/frontends/nxt2002.c | 3 ++- 25-akpm/drivers/media/dvb/frontends/tda1004x.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff -puN drivers/media/dvb/frontends/nxt2002.c~dvb-clarify-firmware-upload-messages drivers/media/dvb/frontends/nxt2002.c --- 25/drivers/media/dvb/frontends/nxt2002.c~dvb-clarify-firmware-upload-messages 2005-03-21 20:57:14.000000000 -0800 +++ 25-akpm/drivers/media/dvb/frontends/nxt2002.c 2005-03-21 20:57:14.000000000 -0800 @@ -520,7 +520,7 @@ static int nxt2002_init(struct dvb_front if (!state->initialised) { /* request the firmware, this will block until someone uploads it */ - printk("nxt2002: Waiting for firmware upload...\n"); + printk("nxt2002: Waiting for firmware upload (%s)...\n", NXT2002_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, NXT2002_DEFAULT_FIRMWARE); printk("nxt2002: Waiting for firmware upload(2)...\n"); if (ret) { @@ -534,6 +534,7 @@ static int nxt2002_init(struct dvb_front release_firmware(fw); return ret; } + printk("nxt2002: firmware upload complete\n"); /* Put the micro into reset */ nxt2002_microcontroller_stop(state); diff -puN drivers/media/dvb/frontends/tda1004x.c~dvb-clarify-firmware-upload-messages drivers/media/dvb/frontends/tda1004x.c --- 25/drivers/media/dvb/frontends/tda1004x.c~dvb-clarify-firmware-upload-messages 2005-03-21 20:57:14.000000000 -0800 +++ 25-akpm/drivers/media/dvb/frontends/tda1004x.c 2005-03-21 20:57:14.000000000 -0800 @@ -353,7 +353,7 @@ static int tda10045_fwupload(struct dvb_ if (tda1004x_check_upload_ok(state, 0x2c) == 0) return 0; /* request the firmware, this will block until someone uploads it */ - printk("tda1004x: waiting for firmware upload...\n"); + printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10045_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE); if (ret) { printk("tda1004x: no firmware upload (timeout or file not found?)\n"); @@ -372,6 +372,7 @@ static int tda10045_fwupload(struct dvb_ ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10045H_FWPAGE, TDA10045H_CODE_IN); if (ret) return ret; + printk("tda1004x: firmware upload complete\n"); /* wait for DSP to initialise */ /* DSPREADY doesn't seem to work on the TDA10045H */ @@ -396,7 +397,7 @@ static int tda10046_fwupload(struct dvb_ if (tda1004x_check_upload_ok(state, 0x20) == 0) return 0; /* request the firmware, this will block until someone uploads it */ - printk("tda1004x: waiting for firmware upload...\n"); + printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10046_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE); if (ret) { printk("tda1004x: no firmware upload (timeout or file not found?)\n"); @@ -414,6 +415,7 @@ static int tda10046_fwupload(struct dvb_ ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN); if (ret) return ret; + printk("tda1004x: firmware upload complete\n"); /* wait for DSP to initialise */ timeout = jiffies + HZ; _