Merge remote-tracking branch 'edac-amd/for-next'

[karo-tx-linux.git] / drivers / media / usb / msi2500 / msi2500.c

diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
index c104315fdc17217f4fad27b6c86e017fa126b7b2..2d33033682af3635a1237d14e0bef045185e7ef0 100644 (file)
--- a/drivers/media/usb/msi2500/msi2500.c
+++ b/drivers/media/usb/msi2500/msi2500.c
@@ -839,8 +839,6 @@ static int msi2500_set_usb_adc(struct msi2500_dev *dev)
                goto err;
 
        ret = msi2500_ctrl_msg(dev, CMD_WREG, reg3);
-       if (ret)
-               goto err;
 err:
        return ret;
 }