diff --git a/[refs] b/[refs] index 7f8995ab843f..ca5691cff95c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8f311a5b6b9163f6aeba2524eaab92dc3b0fb6f +refs/heads/master: f06a23c93b900c37ef14858868c00dc8f061fa22 diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c index 057d840b90de..7984e036c041 100644 --- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c +++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c @@ -436,10 +436,15 @@ static int vmk80xx_write_packet(struct vmk80xx_private *devpriv, int cmd) static int vmk80xx_reset_device(struct vmk80xx_private *devpriv) { size_t size; + int retval; size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize); memset(devpriv->usb_tx_buf, 0, size); - return vmk80xx_write_packet(devpriv, VMK8055_CMD_RST); + retval = vmk80xx_write_packet(devpriv, VMK8055_CMD_RST); + if (retval) + return retval; + /* set outputs to known state as we cannot read them */ + return vmk80xx_write_packet(devpriv, VMK8055_CMD_WRT_AD); } #define DIR_IN 1