On Friday, October 16, 2015 11:21 PM, Greg KH wrote:
> On Tue, Oct 13, 2015 at 05:48:03PM -0700, H Hartley Sweeten wrote:
>> Clarify the interrupt handler by splitting the analog input handling
>> into a new function.
>>
>> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
>> Reviewed-by: Ian Abbott <abbotti@xxxxxxxxx>
>> ---
>> drivers/staging/comedi/drivers/cb_pcidas.c | 80 ++++++++++++++++++------------
>> 1 file changed, 47 insertions(+), 33 deletions(-)
>
> This patch fails to apply for some odd reason, can you rebase and resend
> the series starting at this location?
Not a problem.
Looks like the conflict was caused by:
commit e4c0c6bc0c3baa6ba8cce4db5568fe9db5ad3c5f
Author: Shraddha Barke <shraddha.6596@xxxxxxxxx>
Date: Thu Oct 15 00:58:26 2015 +0530
Staging: comedi: Remove unnecessary cast on void pointer
This chunk:
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index b43e836..b589e17 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1234,7 +1234,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status)
static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
{
- struct comedi_device *dev = (struct comedi_device *)d;
+ struct comedi_device *dev = d;
const struct cb_pcidas_board *board = dev->board_ptr;
struct cb_pcidas_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev;
I didn't see this patch on the devel list....
Oh well, I will post the rebased patches shortly with Ian's Reviewed-by tag.
Thanks,
Hartley
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
