--- zzzz-none-000/linux-3.10.107/drivers/block/swim.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/drivers/block/swim.c 2021-02-04 17:41:59.000000000 +0000 @@ -549,7 +549,7 @@ case READ: err = floppy_read_sectors(fs, blk_rq_pos(req), blk_rq_cur_sectors(req), - req->buffer); + bio_data(req->bio)); break; } done: @@ -893,7 +893,7 @@ swim_base = ioremap(res->start, resource_size(res)); if (!swim_base) { - return -ENOMEM; + ret = -ENOMEM; goto out_release_io; } @@ -924,7 +924,6 @@ return 0; out_kfree: - platform_set_drvdata(dev, NULL); kfree(swd); out_iounmap: iounmap(swim_base); @@ -962,7 +961,6 @@ if (res) release_mem_region(res->start, resource_size(res)); - platform_set_drvdata(dev, NULL); kfree(swd); return 0; @@ -973,7 +971,6 @@ .remove = swim_remove, .driver = { .name = CARDNAME, - .owner = THIS_MODULE, }, };