Merge git://github.com/davem330/ide (0d617928) · Commits · e / devices / android_kernel_sony_msm8998

drivers/ide/ide-disk.c

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue q, struct request rq)
	if (!(rq->cmd_flags & REQ_FLUSH))		if (!(rq->cmd_flags & REQ_FLUSH))
	return BLKPREP_OK;		return BLKPREP_OK;

			if (rq->special) {
			cmd = rq->special;
			memset(cmd, 0, sizeof(*cmd));
			} else {
	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);		cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
			}

	/* FIXME: map struct ide_taskfile on rq->cmd[] */		/* FIXME: map struct ide_taskfile on rq->cmd[] */
	BUG_ON(cmd == NULL);		BUG_ON(cmd == NULL);