[kernel] r22351 - dists/trunk/linux/debian/patches/bugfix/all

[Maximilian Attems]

Author: maks
Date: Sun Feb  8 19:30:35 2015
New Revision: 22351

Log:
firmware second go

Signed-off-by: maximilian attems <maks at debian.org>

Modified:
   dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch

Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch	Sun Feb  8 19:05:12 2015	(r22350)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch	Sun Feb  8 19:30:35 2015	(r22351)
@@ -2064,8 +2064,8 @@
  	ft1000_enable_interrupts(dev);
 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
 +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
-@@ -137,10 +137,8 @@ static int ft1000_probe(struct usb_inter
- 		ft1000dev->bulk_out_endpointAddr);
+@@ -135,10 +135,8 @@ static int ft1000_probe(struct usb_inter
+ 		 ft1000dev->bulk_out_endpointAddr);
  
  	ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev);
 -	if (ret < 0) {
@@ -2136,11 +2136,11 @@
  	if (0 != ret) {
 --- a/drivers/staging/media/lirc/lirc_zilog.c
 +++ b/drivers/staging/media/lirc/lirc_zilog.c
-@@ -768,8 +768,6 @@ static int fw_load(struct IR_tx *tx)
+@@ -759,8 +759,6 @@ static int fw_load(struct IR_tx *tx)
  	/* Request codeset data file */
  	ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", tx->ir->l.dev);
  	if (ret != 0) {
--		zilog_error("firmware haup-ir-blaster.bin not available (%d)\n",
+-		dev_err(tx->ir->l.dev, "firmware haup-ir-blaster.bin not available (%d)\n",
 -			    ret);
  		ret = ret < 0 ? ret : -EFAULT;
  		goto out;
@@ -2590,8 +2590,8 @@
  	if (firmware->size < sizeof(header)) {
 --- a/sound/pci/echoaudio/echoaudio.c
 +++ b/sound/pci/echoaudio/echoaudio.c
-@@ -57,11 +57,8 @@ static int get_firmware(const struct fir
- 	DE_ACT(("firmware requested: %s\n", card_fw[fw_index].data));
+@@ -60,11 +60,8 @@ static int get_firmware(const struct fir
+ 		"firmware requested: %s\n", card_fw[fw_index].data);
  	snprintf(name, sizeof(name), "ea/%s", card_fw[fw_index].data);
  	err = request_firmware(fw_entry, name, pci_device(chip));
 -	if (err < 0)