Only write d_private for memory stick
Merge pull request #5865 from raven02/patch-1

Only write d_private for memory stick
Merge remote-tracking branch 'origin/master' into Universal_Audio_Branch