[PATCH] sn: fixes due to driver core changes