From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Nov 2016 18:15:09 +0000 (-0700)
Subject: Merge tag 'media/v4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.9-rc4~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d8d1721cfb3162abbda078d67a928792d6552b84;p=linux-2.6-block.git

Merge tag 'media/v4.9-3' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "A series of fixup patches meant to fix the usage of DMA on stack, plus
  one warning fixup"

* tag 'media/v4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (32 commits)
  [media] radio-bcm2048: don't ignore errors
  [media] pctv452e: fix semicolon.cocci warnings
  [media] flexcop-usb: don't use stack for DMA
  [media] stk-webcam: don't use stack for DMA
  [media] s2255drv: don't use stack for DMA
  [media] cpia2_usb: don't use stack for DMA
  [media] digitv: handle error code on RC query
  [media] dw2102: return error if su3000_power_ctrl() fails
  [media] nova-t-usb2: handle error code on RC query
  [media] technisat-usb2: use DMA buffers for I2C transfers
  [media] pctv452e: don't call BUG_ON() on non-fatal error
  [media] pctv452e: don't do DMA on stack
  [media] nova-t-usb2: don't do DMA on stack
  [media] gp8psk: don't go past the buffer size
  [media] gp8psk: don't do DMA on stack
  [media] dtv5100: don't do DMA on stack
  [media] dtt200u: handle USB control message errors
  [media] dtt200u: don't do DMA on stack
  [media] dtt200u-fe: handle errors on USB control messages
  [media] dtt200u-fe: don't do DMA on stack
  ...
---

d8d1721cfb3162abbda078d67a928792d6552b84
diff --cc drivers/staging/media/bcm2048/radio-bcm2048.c
index ea15cc638097,0f088405e186..4d9bd02ede47
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@@ -482,9 -482,13 +482,11 @@@ static int bcm2048_set_rds_no_lock(stru
  					   flags);
  		memset(&bdev->rds_info, 0, sizeof(bdev->rds_info));
  	}
+ 	if (err)
+ 		return err;
  
 -	err = bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_SYSTEM,
 -				   bdev->cache_fm_rds_system);
 -
 -	return err;
 +	return bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_SYSTEM,
 +				    bdev->cache_fm_rds_system);
  }
  
  static int bcm2048_get_rds_no_lock(struct bcm2048_device *bdev)