add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/s390/block/scm_blk.c
..
..
@@ -256,7 +256,8 @@
256
256
 	for (i = 0; i < nr_requests_per_io && scmrq->request[i]; i++) {
257
257
 		error = blk_mq_rq_to_pdu(scmrq->request[i]);
258
258
 		*error = scmrq->error;
259
-		blk_mq_complete_request(scmrq->request[i]);
259
+		if (likely(!blk_should_fake_timeout(scmrq->request[i]->q)))
260
+			blk_mq_complete_request(scmrq->request[i]);
260
261
 	}
261
262
 
262
263
 	atomic_dec(&bdev->queued_reqs);
..
..
@@ -500,7 +501,7 @@
500
501
 
501
502
 	/* 512 byte sectors */
502
503
 	set_capacity(bdev->gendisk, scmdev->size >> 9);
503
-	device_add_disk(&scmdev->dev, bdev->gendisk);
504
+	device_add_disk(&scmdev->dev, bdev->gendisk, NULL);
504
505
 	return 0;
505
506
 
506
507
 out_queue: