Unverified Commit 9e8286c8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3292 [sync] PR-2843: Add error handle for sd 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/2843 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/74IAWGRELUBCPDEYMSEIAQRP2MQYJMBN/ 
Luis Chamberlain (1):
  scsi: sd: Add error handling support for add_disk()

Zhong Jinghua (1):
  scsi: sd: Clean up sdkp if device_add_disk() failed


-- 
2.39.2
 
https://gitee.com/openeuler/kernel/issues/I81XCK 
 
Link:https://gitee.com/openeuler/kernel/pulls/3292

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 429067be e0efe852

drivers/scsi/sd.c

+7 −1
Original line number Diff line number Diff line
@@ -3492,7 +3492,13 @@ static int sd_probe(struct device *dev) 
		pm_runtime_set_autosuspend_delay(dev,

			sdp->host->hostt->rpm_autosuspend_delay);

	}

	device_add_disk(dev, gd, NULL);



	error = device_add_disk_safe(dev, gd, NULL);

	if (error) {

		device_unregister(&sdkp->dev);

		goto out;

	}



	blk_delete_region(disk_devt(sdkp->disk), SD_MINORS, sd_default_probe);

	if (sdkp->capacity)

		sd_dif_config_host(sdkp);